PMML : Initial separation of Informer from main PMML module

kiegroup · Jul 12, 2013 · 98a02b2 · 98a02b2
1 parent 317b57f
commit 98a02b2
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 4 deletions.
diff --git a/...rg/drools/pmml/pmml_4_1/pmml_informer.drl → ...rg/drools/pmml/pmml_4_1/pmml_informer.drl b/...rg/drools/pmml/pmml_4_1/pmml_informer.drl → ...rg/drools/pmml/pmml_4_1/pmml_informer.drl
diff --git a/.../templates/informer/informer_imports.drlt → .../templates/informer/informer_imports.drlt b/.../templates/informer/informer_imports.drlt → .../templates/informer/informer_imports.drlt
diff --git a/...mer/modelAddQuestionsToQuestionnaire.drlt → ...mer/modelAddQuestionsToQuestionnaire.drlt b/...mer/modelAddQuestionsToQuestionnaire.drlt → ...mer/modelAddQuestionsToQuestionnaire.drlt
diff --git a/...plates/informer/modelCreateByBinding.drlt → ...plates/informer/modelCreateByBinding.drlt b/...plates/informer/modelCreateByBinding.drlt → ...plates/informer/modelCreateByBinding.drlt
diff --git a/...emplates/informer/modelInvalidAnswer.drlt → ...emplates/informer/modelInvalidAnswer.drlt b/...emplates/informer/modelInvalidAnswer.drlt → ...emplates/informer/modelInvalidAnswer.drlt
diff --git a/...emplates/informer/modelMultiQuestion.drlt → ...emplates/informer/modelMultiQuestion.drlt b/...emplates/informer/modelMultiQuestion.drlt → ...emplates/informer/modelMultiQuestion.drlt
diff --git a/...emplates/informer/modelOutputBinding.drlt → ...emplates/informer/modelOutputBinding.drlt b/...emplates/informer/modelOutputBinding.drlt → ...emplates/informer/modelOutputBinding.drlt
diff --git a/...4_1/templates/informer/modelQuestion.drlt → ...4_1/templates/informer/modelQuestion.drlt b/...4_1/templates/informer/modelQuestion.drlt → ...4_1/templates/informer/modelQuestion.drlt
diff --git a/...plates/informer/modelQuestionBinding.drlt → ...plates/informer/modelQuestionBinding.drlt b/...plates/informer/modelQuestionBinding.drlt → ...plates/informer/modelQuestionBinding.drlt
diff --git a/...ates/informer/modelQuestionRebinding.drlt → ...ates/informer/modelQuestionRebinding.drlt b/...ates/informer/modelQuestionRebinding.drlt → ...ates/informer/modelQuestionRebinding.drlt
diff --git a/...emplates/informer/modelQuestionnaire.drlt → ...emplates/informer/modelQuestionnaire.drlt b/...emplates/informer/modelQuestionnaire.drlt → ...emplates/informer/modelQuestionnaire.drlt
diff --git a/...1/templates/informer/modelRevalidate.drlt → ...1/templates/informer/modelRevalidate.drlt b/...1/templates/informer/modelRevalidate.drlt → ...1/templates/informer/modelRevalidate.drlt
diff --git a/drools-informer/pom.xml b/drools-informer/pom.xml
@@ -38,6 +38,7 @@
     <module>drools-informer-core</module>
     <module>drools-informer-loader</module>
     <module>drools-informer-interaction</module>
+    <module>drools-informer-pmml</module>
     <module>human-task-helpers</module>
   </modules>
 

diff --git a/drools-pmml/pom.xml b/drools-pmml/pom.xml
@@ -40,6 +40,13 @@
       <groupId>org.drools</groupId>
       <artifactId>drools-informer-core</artifactId>
       <version>${chance.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-informer-pmml</artifactId>
+      <version>${chance.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>

diff --git a/drools-pmml/src/main/java/org/drools/pmml/pmml_4_1/PMML4Compiler.java b/drools-pmml/src/main/java/org/drools/pmml/pmml_4_1/PMML4Compiler.java
@@ -22,6 +22,7 @@
 import org.drools.builder.*;
 import org.drools.compiler.PackageRegistry;
 import org.drools.conf.EventProcessingOption;
+import org.drools.io.Resource;
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.StatefulKnowledgeSession;
 import org.mvel2.templates.SimpleTemplateRegistry;
@@ -449,10 +450,14 @@ private static void checkBuildingResources( PMML pmml ) {
     private static void prepareTemplate( String ntempl ) {
         try {
             String path = TEMPLATE_PATH + ntempl;
-            InputStream stream = ResourceFactory.newClassPathResource(path, PMML4Compiler.class).getInputStream();
-
-            registry.addNamedTemplate( path.substring(path.lastIndexOf('/') + 1),
-                    TemplateCompiler.compileTemplate(stream));
+            Resource res = ResourceFactory.newClassPathResource(path, PMML4Compiler.class);
+            if ( res != null ) {
+                InputStream stream = res.getInputStream();
+                if ( stream != null ) {
+                    registry.addNamedTemplate( path.substring(path.lastIndexOf('/') + 1),
+                                               TemplateCompiler.compileTemplate(stream));
+                }
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }