OpenMRS

Timestamp:

02/29/08 19:16:14 (10 months ago)

Author:

tmdugan

Message:

-- dss

* added processPackagePrefix method to Util class

* added defaultPackagePrefix processing to load rule. If a rule token cannot be loaded as passed or from the dynamic rule directory the default package prefix is checked

* fixed an error when checking module class loaders for loaded classes in CompilingClassLoader

Files:

• openmrs-modules/dss/src/org/openmrs/module/dss/CompilingClassLoader.java (modified) (7 diffs)

openmrs-modules/dss/src/org/openmrs/module/dss/CompilingClassLoader.java

@@ -141 +141 @@
-        }
-        
-        
-        
-        // The heart of the ClassLoader -- automatically compile
-        // source as necessary when looking for class files
@@ -151 +149 @@
-        {
-                AdministrationService adminService = Context.getAdministrationService();
-
-
-
-
-
+
+
-                String javaRuleDirectory = Util.processFileDirectoryGlobalProperty("dss.javaRuleDirectory");
-                String classRulesDirectory = Util.processFileDirectoryGlobalProperty(
@@ -215 +210 @@
-                                ModuleFactory.getModuleClassLoaders();
-                        
-
-
+
+
+
+
+
-                                try
-                                {
@@ -235 +233 @@
-                        // Create a pathname from the class name
-                        // E.g. java.lang.Object => java/lang/Object
-
+
+
+
+
+
+
+
-                        // Build objects pointing to the source code (.java) and object
-                        // code (.class)
@@ -247 +251 @@
-                        
-                        // If no javafile exists, run thru the arden parser
-                        
-                        if(mlmFile.exists()&&(!javaFile.exists() || mlmFile.lastModified() > javaFile.lastModified()))
-                        {
@@ -344 +347 @@
-                                byte raw[] = getBytes(classFilename);
-                                // try to turn them into a class
-rulePackagePrefix +
+
-                                
-                                //load class filename into rule table
@@ -363 +366 @@
-                        } catch (Exception ie)
-                        {
-                                log.error("Error defining class file: "+classFilename+". \n"+
-                                                ie.getMessage());
-                        }
-                }