[jboss-svn-commits] JBL Code SVN: r36487 - in labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution: src/main/assembly and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: dpalmer at redhat.com
Date: 2010-12-23 09:22:15 -0500 (Thu, 23 Dec 2010)
New Revision: 36487

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/pom.xml
   labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-engine.xml
   labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-manager.xml
   labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/soa-p-dist.xml
Log:
Fix for missing janino/jsr94 jars

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/pom.xml	2010-12-23 10:05:57 UTC (rev 36486)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/pom.xml	2010-12-23 14:22:15 UTC (rev 36487)
@@ -16,37 +16,18 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>
+    <dependency>
+      <groupId>janino</groupId>
+      <artifactId>janino</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jsr94</groupId>
+      <artifactId>jsr94</artifactId>
+    </dependency>
   </dependencies>
   
   <build>
      <plugins>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-dependency-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>cp-janino-jar</id>
-             <phase>process-resources</phase>
-             <goals>
-               <goal>copy</goal>
-             </goals>
-             <configuration>
-               <artifactItems>
-                 <!-- 
-                 This is for soa-p-dist assembly
-                 copy dependecy library from repo (For ESB integration:jbrules.esb)
-                 -->
-                 <artifactItem>
-                   <groupId>janino</groupId>
-                   <artifactId>janino</artifactId>
-                   <version>2.5.15</version>
-                   <type>jar</type>
-                 </artifactItem>
-               </artifactItems>
-             </configuration>
-           </execution>
-         </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-engine.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-engine.xml	2010-12-23 10:05:57 UTC (rev 36486)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-engine.xml	2010-12-23 14:22:15 UTC (rev 36487)
@@ -57,7 +57,6 @@
       
     </moduleSet>
   </moduleSets>  
-
   <dependencySets>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-manager.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-manager.xml	2010-12-23 10:05:57 UTC (rev 36486)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/brms-manager.xml	2010-12-23 14:22:15 UTC (rev 36487)
@@ -25,4 +25,16 @@
       
     </moduleSet>
   </moduleSets>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <unpack>false</unpack>
+      <includes>
+        <include>janino:janino</include>
+        <include>jsr94:jsr94</include>
+      </includes>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets> 
 </assembly>

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/soa-p-dist.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/soa-p-dist.xml	2010-12-23 10:05:57 UTC (rev 36486)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x-MEAD/soa-distribution/src/main/assembly/soa-p-dist.xml	2010-12-23 14:22:15 UTC (rev 36487)
@@ -33,8 +33,6 @@
             <includes> 
                <include>org.antlr:antlr-runtime</include>
                <include>org.eclipse.jdt.core.compiler:ecj</include>
-               <include>janino:janino</include>
-               <include>jsr94:jsr94</include>
                <include>net.sourceforge.jexcelapi:jxl</include>
                <include>xpp3:xpp3_min</include>
             </includes>
@@ -46,14 +44,15 @@
     </moduleSet>
   </moduleSets>  
 
-  <fileSets>
-    <fileSet>
-      <directory>target/dependency</directory>
+  <dependencySets>
+    <dependencySet>
       <outputDirectory></outputDirectory>
+      <unpack>false</unpack>
       <includes>
-        <include>janino*</include>
+        <include>janino:janino</include>
+        <include>jsr94:jsr94</include>
       </includes>
-    </fileSet>
-  </fileSets>
-
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets> 
 </assembly>