fix generation of kjar with executable model + sample project

kiegroup · Dec 14, 2017 · a9a2959 · a9a2959
1 parent 55fb462
commit a9a2959
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 deletions.
diff --git a/.../main/java/org/kie/sample/model/Fire.java → ...src/main/java/org/kie/firealarm/Fire.java b/.../main/java/org/kie/sample/model/Fire.java → ...src/main/java/org/kie/firealarm/Fire.java
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-package org.kie.sample.model;
+package org.kie.firealarm;
 
 public class Fire {
 

diff --git a/.../main/java/org/kie/sample/model/Room.java → ...src/main/java/org/kie/firealarm/Room.java b/.../main/java/org/kie/sample/model/Room.java → ...src/main/java/org/kie/firealarm/Room.java
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-package org.kie.sample.model;
+package org.kie.firealarm;
 
 public class Room {
 

diff --git a/.../java/org/kie/sample/model/Sprinkler.java → ...ain/java/org/kie/firealarm/Sprinkler.java b/.../java/org/kie/sample/model/Sprinkler.java → ...ain/java/org/kie/firealarm/Sprinkler.java
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-package org.kie.sample.model;
+package org.kie.firealarm;
 
 public class Sprinkler {
 

diff --git a/kie-maven-plugin-example/src/main/resources/META-INF/kmodule.xml b/kie-maven-plugin-example/src/main/resources/META-INF/kmodule.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
-    <kbase name="KBase1" packages="KBase1">
+    <kbase name="KBase1" packages="org.kie.example">
         <ksession name="KBase1.session" type="stateful"/>
     </kbase>
-    <kbase name="FireAlarmKBase" packages="FireAlarmKBase">
+    <kbase name="FireAlarmKBase" packages="org.kie.firealarm">
         <ksession name="FireAlarmKBase.session" type="stateful"/>
     </kbase>
 </kmodule>
diff --git a/...xample/src/main/resources/KBase1/decA.drl → ...c/main/resources/org/kie/example/decA.drl b/...xample/src/main/resources/KBase1/decA.drl → ...c/main/resources/org/kie/example/decA.drl
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-package org.kie.test
+package org.kie.example
 declare FactA
     fieldB: FactB
 end
diff --git a/...xample/src/main/resources/KBase1/decB.drl → ...c/main/resources/org/kie/example/decB.drl b/...xample/src/main/resources/KBase1/decB.drl → ...c/main/resources/org/kie/example/decB.drl
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-package org.kie.test
+package org.kie.example
 declare FactB
     fieldA: FactA
 end
diff --git a/...xample/src/main/resources/KBase1/rule.drl → ...c/main/resources/org/kie/example/rule.drl b/...xample/src/main/resources/KBase1/rule.drl → ...c/main/resources/org/kie/example/rule.drl
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-package org.kie.test
+package org.kie.example
 rule R1 when
    $fieldA : FactA( $fieldB : fieldB )
    FactB( this == $fieldB, fieldA == $fieldA )

diff --git a/...c/main/resources/FireAlarmKBase/alarm.drl → ...ain/resources/org/kie/firealarm/alarm.drl b/...c/main/resources/FireAlarmKBase/alarm.drl → ...ain/resources/org/kie/firealarm/alarm.drl
@@ -13,6 +13,6 @@
  * limitations under the License.
 */
 
-package org.kie.sample.model
+package org.kie.firealarm
 declare Alarm
 end
diff --git a/...c/main/resources/FireAlarmKBase/rules.drl → ...ain/resources/org/kie/firealarm/rules.drl b/...c/main/resources/FireAlarmKBase/rules.drl → ...ain/resources/org/kie/firealarm/rules.drl
@@ -13,10 +13,10 @@
  * limitations under the License.
 */
 
-package org.kie.sample
+package org.kie.firealarm
 
 import java.util.*
-import org.kie.sample.model.*
+import org.kie.firealarm.*
 
 rule "When there is a fire turn on the sprinkler"
 when

diff --git a/.../main/resources/FireAlarmKBase/rules2.drl → ...in/resources/org/kie/firealarm/rules2.drl b/.../main/resources/FireAlarmKBase/rules2.drl → ...in/resources/org/kie/firealarm/rules2.drl
@@ -13,10 +13,10 @@
  * limitations under the License.
 */
 
-package org.kie.sample
+package org.kie.firealarm
 
 import java.util.*
-import org.kie.sample.model.*
+import org.kie.firealarm.*
 
 rule "Raise the alarm when we have one or more fires"
 when

diff --git a/kie-maven-plugin-example/src/test/java/org/kie/kproject/KProjectTest.java b/kie-maven-plugin-example/src/test/java/org/kie/kproject/KProjectTest.java
@@ -21,9 +21,9 @@
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.rule.FactHandle;
-import org.kie.sample.model.Fire;
-import org.kie.sample.model.Room;
-import org.kie.sample.model.Sprinkler;
+import org.kie.firealarm.Fire;
+import org.kie.firealarm.Room;
+import org.kie.firealarm.Sprinkler;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/kie-maven-plugin/src/main/java/org/kie/maven/plugin/GenerateModelMojo.java b/kie-maven-plugin/src/main/java/org/kie/maven/plugin/GenerateModelMojo.java
@@ -162,9 +162,11 @@ private void generateModel() throws MojoExecutionException {
 
             // copy the META-INF packages file
             final MemoryFile packagesMemoryFile = (MemoryFile) mfs.getFile(CanonicalKieModule.MODEL_FILE);
-            final Path packagesDestinationPath = Paths.get(targetDirectory.getPath(), "classes", "META-INF", packagesMemoryFile.getName());
+            final String packagesMemoryFilePath = packagesMemoryFile.getFolder().getPath().toPortableString();
+            final Path packagesDestinationPath = Paths.get(targetDirectory.getPath(), "classes", packagesMemoryFilePath, packagesMemoryFile.getName());
 
             try {
+                Files.createDirectories( packagesDestinationPath );
                 Files.copy(packagesMemoryFile.getContents(), packagesDestinationPath, StandardCopyOption.REPLACE_EXISTING);
             } catch (IOException e) {
                 e.printStackTrace();