[jboss-svn-commits] JBL Code SVN: r34664 - in labs/jbossrules/soa_branches/SOA5MaveniseDev: brms-distribution and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Aug 12 04:38:11 EDT 2010


Author: ryanzhang
Date: 2010-08-12 04:38:10 -0400 (Thu, 12 Aug 2010)
New Revision: 34664

Added:
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/guvnor.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/pre-bin.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/src.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/soa-distribution/
Removed:
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/build-common.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/brms-engine.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/pre-bin_soaversion.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/
   labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-soa-dist/
Modified:
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/pom.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/post-patch/patch_version.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/brms.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/docs.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/examples.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/javadocs.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
   labs/jbossrules/soa_branches/SOA5MaveniseDev/pom.xml
   labs/jbossrules/soa_branches/SOA5MaveniseDev/soa-distribution/pom.xml
Log:
Update soa profile and brms profile, brms profile is still unfinished

Copied: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution (from rev 34663, labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist)

Deleted: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/build-common.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/build-common.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/build-common.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -1,34 +0,0 @@
-<project name="SOA common routines">
-	<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="groovy.path"/>
-  	<!-- Routine build
-      ++ Call with parameters:
-      ++     module
-    -->
-	<target name="soa.routine.build">
-		<groovy>
-      def ant=new AntBuilder()
-      <!-- build -->
-      ant.ant(antfile:"build.xml", dir:properties['module_base_dir'], target:"build"){
-        property(name:"module_base_dir", value:properties['module_base_dir'])
-		    property(name:"project.version", value:properties['project.version'])
-      }
-      <!-- post-patch -->
-        println("hello, post-patch")
-        f=new File(properties['module_base_dir'] + "/post-patch")
-        if (f.exists()){
-          f.eachFileMatch(~/.*\.xml/){
-            println "patch:"+it
-            ant.ant(antfile:it, target:"apply.patch", inheritAll:"true"){
-              property(name:"module_base_dir", value:properties['module_base_dir'])
-           }
-          }
-        }
-
-      <!-- assemble-->
-      ant.ant(antfile:"build.xml", dir:properties['module_base_dir'], target:"assemble"){
-        property(name:"module_base_dir", value:properties['module_base_dir'])
-        property(name:"module_build_finalName", value:properties['module_build_finalName'])
-      }
-    </groovy>
-	</target>
-</project>

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/pom.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/pom.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -3,7 +3,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <name>Productization :: BRMS </name>
+  <name>Drools :: Build BRMS distribution </name>
   <groupId>org.drools</groupId>
   <artifactId>BRMS</artifactId>
   <version>5.0.2.BRMS</version>
@@ -16,8 +16,20 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <properties> 
+    <soa_common_build_src.groupId>org.jboss.jbosssoa</soa_common_build_src.groupId>
+    <soa_common_build_src.artifactId>soa-common-build-src</soa_common_build_src.artifactId>
+    <soa_common_build_src.version>1.0.0</soa_common_build_src.version>
+  </properties>
+
     <dependencies>
       <dependency>
+        <groupId>${soa_common_build_src.groupId}</groupId>
+        <artifactId>${soa_common_build_src.artifactId}</artifactId>
+        <version>${soa_common_build_src.version}</version>
+        <type>zip</type>
+      </dependency>
+      <dependency>
         <groupId>org.drools</groupId>
         <artifactId>drools-core</artifactId>
         <version>${project.version}</version>
@@ -53,25 +65,13 @@
         <artifactId>drools-mc</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all</artifactId>
+        <version>1.7.0</version>
+      </dependency>
     </dependencies>
 
-  <repositories>
-    <repository>
-    <id>jawa05</id>
-    <url>http://jawa05.englab.brq.redhat.com/maven2</url>
-  </repository>
-  </repositories>
-
-    <distributionManagement>
-      <repository>
-        <id>Internal testing release</id>
-        <name>Internal testing release</name>
-        <url>scp://rzhang@jawa05.englab.brq.redhat.com:/archive/maven2</url>
-      </repository>
-    </distributionManagement>
-
-
   <!-- Plugins -->
   <build>
      <plugins>
@@ -80,6 +80,24 @@
          <artifactId>maven-dependency-plugin</artifactId>
          <executions>
            <execution>
+             <id>unpack-soa-common-build-src</id>
+             <phase>process-resources</phase>
+             <goals>
+               <goal>unpack</goal>
+             </goals>
+             <configuration>
+               <outputDirectory>${project.basedir}</outputDirectory>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>${soa_common_build_src.groupId}</groupId>
+                   <artifactId>${soa_common_build_src.artifactId}</artifactId>
+                   <version>${soa_common_build_src.version}</version>
+                   <type>zip</type>
+                 </artifactItem>
+               </artifactItems>
+             </configuration>
+           </execution>
+           <execution>
              <id>unpack-modules</id>
              <phase>process-resources</phase>
              <goals>
@@ -143,7 +161,8 @@
               </goals>
               <configuration>
                 <tasks>
-                  <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}" inheritAll="false">
+                  <echo>${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}</echo>
+                  <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}" inheritAll="true">
                     <property name="module_base_dir" value="${project.basedir}"/>
                     <property name="module_build_finalName" value="${project.build.finalName}"/>
                     <property name="project.version" value="${project.version}"/>
@@ -167,11 +186,16 @@
               </goals>
 		        <configuration>
 		        <descriptors>
-              <descriptor>resource/assembly/brms-engine.xml</descriptor>
-              <!--descriptor>resource/assembly/brms-engine.xml</descriptor>
-              <descriptor>resource/assembly/brms.xml</descriptor>
-              <descriptor>resource/assembly/docs.xml</descriptor>
-              <descriptor>resource/assembly/javadocs.xml</descriptor-->
+             	<descriptor>resource/assembly/pre-bin.xml</descriptor>
+		          <descriptor>src/main/assembly/bin.xml</descriptor>
+					    <descriptor>resource/assembly/guvnor.xml</descriptor>
+		          <descriptor>resource/assembly/src.xml</descriptor>
+		          <descriptor>src/main/assembly/eclipse.xml</descriptor>
+		          <descriptor>src/main/assembly/examples.xml</descriptor>
+		          <descriptor>src/main/assembly/solver.xml</descriptor>
+		          <descriptor>resource/assembly/docs.xml</descriptor>
+		          <descriptor>resource/assembly/javadocs.xml</descriptor>
+		          <descriptor>resource/assembly/brms.xml</descriptor>
 		        </descriptors>
 		        </configuration>
           </execution>

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/post-patch/patch_version.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/post-patch/patch_version.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/post-patch/patch_version.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -1,7 +1,6 @@
 <project name="patchname" default="apply.patch">
 	<target name="apply.patch">
 	  <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="groovy.path"/>
-
     <groovy>
       def f=new File(properties['module_base_dir']+"/.svn/entries")
       def i=0

Deleted: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/brms-engine.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/resource/assembly/brms-engine.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/brms-engine.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- NOTE: SOA-P version excludes org.drools:drools-clips, org.drools:drools-transformer-*, org.drools:drools-server, 
-org.drools:drools-workitems, org.drools:drools-process-task-->
-<assembly>
-  <id>pre-bin</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  
-  <includeBaseDirectory>false</includeBaseDirectory>
-  
-  <fileSets>
-  
-    <fileSet>
-      <includes>
-        <include>../JBossEULA.txt</include>
-        <include>../README_DEPENDENCIES.txt</include>
-      </includes>
-    </fileSet>
-    
-  </fileSets>  
-
-    
-    <!--moduleSet>
-    	<includes>
-    		<include>org.drools:drools-documentation</include>
-    	</includes>
-    	
-      <binaries>
-        <outputDirectory>documentation</outputDirectory>
-        <outputFileNameMapping>manual</outputFileNameMapping>
-	      <unpack>true</unpack> 
-	      <unpackOptions>
-	          <includes>
-	            <include>shared/**</include>
-	            <include>html/**</include>
-	            <include>manual/html_single/**</include>
-	          </includes>    	              	      
-	          <excludes>
-	            <exclude>eclipse/**</exclude>
-	            <exclude>META-INF/**</exclude>
-	          </excludes>
-	      </unpackOptions>  	          
-      </binaries>   
-	    
-    </moduleSet-->    
-  </moduleSets>  
-
-</assembly>

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/brms.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/resource/assembly/brms.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/brms.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -11,11 +11,11 @@
   <files>
 	<file>
 		<source>./target/drools-${project.version}-guvnor.zip</source>
-    <destName>jboss-brms-manager.zip</destName>
+                <destName>jboss-brms-manager.zip</destName>
 	</file>
 	<file>
 		<source>./target/drools-${project.version}-bin.zip</source>
-    <destName>jboss-brms-engine.zip</destName>
+                <destName>jboss-brms-engine.zip</destName>
 	</file>
   </files>
    

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/docs.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/resource/assembly/docs.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/docs.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -9,7 +9,7 @@
   
   <files>
      <file>
-       <source>resource/documentation/index.html</source>
+       <source>resource/documentation/index_soaversion.html</source>
        <outputDirectory></outputDirectory>
        <destName>index.html</destName>
      </file>
@@ -17,7 +17,7 @@
   
   <fileSets>
     <fileSet>
-      <directory>../src/documentation/</directory>
+      <directory>src/documentation/</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -28,7 +28,7 @@
     </fileSet>
   
     <fileSet>
-      <directory>../drools-docs/drools-docs-introduction/target/docbook/publish/en-US/</directory>
+      <directory>drools-docs/drools-docs-introduction/target/docbook/publish/en-US/</directory>
       <outputDirectory>drools-introduction</outputDirectory>
       <includes>
          <!--include>drools-docs/**</include-->
@@ -45,7 +45,7 @@
     </fileSet>
     
     <fileSet>
-      <directory>../drools-docs/drools-docs-expert/target/docbook/publish/en-US/</directory>
+      <directory>drools-docs/drools-docs-expert/target/docbook/publish/en-US/</directory>
       <outputDirectory>drools-expert</outputDirectory>
       <includes>
          <!--include>drools-docs/**</include-->
@@ -62,7 +62,7 @@
     </fileSet> 
     
     <fileSet>
-      <directory>../drools-docs/drools-docs-fusion/target/docbook/publish/en-US/</directory>
+      <directory>drools-docs/drools-docs-fusion/target/docbook/publish/en-US/</directory>
       <outputDirectory>drools-fusion</outputDirectory>
       <includes>
          <!--include>drools-docs/**</include-->
@@ -79,7 +79,7 @@
     </fileSet>  
     
     <fileSet>
-      <directory>../drools-docs/drools-docs-flow/target/docbook/publish/en-US/</directory>
+      <directory>drools-docs/drools-docs-flow/target/docbook/publish/en-US/</directory>
       <outputDirectory>drools-flow</outputDirectory>
       <includes>
          <!--include>drools-docs/**</include-->
@@ -96,7 +96,7 @@
     </fileSet>   
     
     <fileSet>
-      <directory>../drools-docs/drools-docs-guvnor/target/docbook/publish/en-US/</directory>
+      <directory>drools-docs/drools-docs-guvnor/target/docbook/publish/en-US/</directory>
       <outputDirectory>drools-guvnor</outputDirectory>
       <includes>
          <!--include>drools-docs/**</include-->
@@ -113,7 +113,7 @@
     </fileSet>      
     
     <fileSet>
-      <directory>../drools-docs/drools-docs-solver/target/docbook/publish/en-US/</directory>
+      <directory>drools-docs/drools-docs-solver/target/docbook/publish/en-US/</directory>
       <outputDirectory>drools-solver</outputDirectory>
       <includes>
          <!--include>drools-docs/**</include-->

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/examples.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/resource/assembly/examples.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/examples.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -10,6 +10,7 @@
   <fileSets>
 
     <fileSet>
+      <directory>./</directory>
       <includes>
         <include>JBossEULA.txt</include>
         <include>README_DEPENDENCIES.txt</include>

Added: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/guvnor.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/guvnor.xml	                        (rev 0)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/guvnor.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>guvnor</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <!-- We include the BRMS specifically, as its a single atomic war -->
+  <files>
+	<file>
+    <source>drools-guvnor/target/drools-guvnor.war</source>
+    <destName>jboss-brms.war</destName>
+	</file>
+  </files>
+   
+</assembly>

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/javadocs.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/resource/assembly/javadocs.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/javadocs.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -9,7 +9,7 @@
   
   <files>
       <file>
-       <source>resource/documentation/index.html</source>
+       <source>src/javadocs/index_soaversion.html</source>
        <outputDirectory></outputDirectory>
        <destName>index.html</destName>
     </file>  
@@ -18,76 +18,77 @@
   <fileSets>
   
     <fileSet>
-      <includes>
-        <include>../JBossEULA.txt</include>
+      <includes>      
+        <include>JBossEULA.txt</include>
       </includes>
     </fileSet>         
 
     <fileSet>
-      <directory>../drools-api/target/site/apidocs</directory>
-      <outputDirectory>stable/drools-api</outputDirectory>
+       <directory>drools-api/target/site/apidocs</directory>
+       <outputDirectory>stable/drools-api</outputDirectory>
     </fileSet>  
     
     <fileSet>
-      <directory>../drools-core/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-core</outputDirectory>
+       <directory>drools-core/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-core</outputDirectory>
     </fileSet>  
 
     <fileSet>
-      <directory>../drools-compiler/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-compiler</outputDirectory>
+       <directory>drools-compiler/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-compiler</outputDirectory>
     </fileSet> 
     
     <fileSet>
-      <directory>../drools-decisiontables/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-decisiontables</outputDirectory>
+       <directory>drools-decisiontables/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-decisiontables</outputDirectory>
     </fileSet>   
 
     <fileSet>
-      <directory>../drools-clips/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-clips</outputDirectory>
+       <directory>drools-clips/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-clips</outputDirectory>
     </fileSet>     
    
     <fileSet>
-      <directory>../drools-dataloaders/drools-dataloaders-smooks/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-dataloaders-smooks</outputDirectory>
+       <directory>drools-dataloaders/drools-dataloaders-smooks/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-dataloaders-smooks</outputDirectory>
     </fileSet> 
     
     <fileSet>
-      <directory>../drools-dataloaders/drools-dataloaders-jaxb/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-dataloaders-jaxb</outputDirectory>
+       <directory>drools-dataloaders/drools-dataloaders-jaxb/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-dataloaders-jaxb</outputDirectory>
     </fileSet>   
 
     <fileSet>
-      <directory>../drools-process/drools-process-task/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-process-task</outputDirectory>
+       <directory>drools-process/drools-process-task/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-process-task</outputDirectory>
     </fileSet>   
     
     <fileSet>
-      <directory>../drools-process/drools-workitems/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-workitems</outputDirectory>
+       <directory>drools-process/drools-workitems/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-workitems</outputDirectory>
     </fileSet>     
     
     <fileSet>
-      <directory>../drools-process/drools-process-enterprise/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-process-enterprise</outputDirectory>
+       <directory>drools-process/drools-process-enterprise/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-process-enterprise</outputDirectory>
     </fileSet> 
 
     <fileSet>
-      <directory>../drools-templates/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-templates</outputDirectory>
+       <directory>drools-templates/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-templates</outputDirectory>
     </fileSet>   
     
     <fileSet>
-      <directory>../drools-verifier/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-verifier</outputDirectory>
+       <directory>drools-verifier/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-verifier</outputDirectory>
     </fileSet>   
     
     <fileSet>
-      <directory>../drools-server/target/site/apidocs</directory>
-      <outputDirectory>unstable/drools-server</outputDirectory>
+       <directory>drools-server/target/site/apidocs</directory>
+       <outputDirectory>unstable/drools-server</outputDirectory>
     </fileSet>     
     
   </fileSets>  
 
 </assembly>
+

Copied: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/pre-bin.xml (from rev 34663, labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/resource/assembly/pre-bin_soaversion.xml)
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/pre-bin.xml	                        (rev 0)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/pre-bin.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- NOTE: SOA-P version excludes org.drools:drools-clips, org.drools:drools-transformer-*, org.drools:drools-server, 
+org.drools:drools-workitems, org.drools:drools-process-task-->
+
+<assembly>
+  <id>pre-bin</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>JBossEULA.txt</include>
+        <include>README_DEPENDENCIES.txt</include>
+      </includes>
+    </fileSet>
+  </fileSets>  
+
+  <moduleSets>
+    <moduleSet>
+    	<includes>
+    		<!-- note: we do not include BRMS here, as it is distributed as a single war, and a war includes all already -->
+        <include>org.drools:drools-api</include>
+    		<include>org.drools:drools-core</include>
+    		<include>org.drools:drools-compiler</include>
+    		<include>org.drools:drools-jsr94</include>
+    		<include>org.drools:drools-decisiontables</include>
+    		<include>org.drools:drools-templates</include>
+    		<!--include>org.drools:drools-clips</include-->
+    		<include>org.drools:drools-verifier</include>
+     		<include>org.drools:drools-ant</include>
+        <!--include>org.drools:drools-server</include-->            
+        <include>org.drools:drools-messenger-jms</include>
+    		<!--include>org.drools:drools-transformer-jaxb</include>
+    		<include>org.drools:drools-transformer-smooks</include>
+    		<include>org.drools:drools-transformer-jxls</include>
+    		<include>org.drools:drools-transformer-xstream</include>            
+        <include>org.drools:drools-workitems</include>
+        <include>org.drools:drools-process-task</include-->            
+        <include>org.drools:drools-persistence-jpa</include>
+    	</includes>
+    	
+      <binaries>
+        <outputDirectory></outputDirectory>
+        <unpack>false</unpack> 
+        
+    	  <dependencySets>	
+    	    <dependencySet>
+    	      <outputDirectory>lib</outputDirectory>
+    	      <unpack>false</unpack>
+    	      <excludes> 
+    	         <exclude>org.drools:drools-*</exclude>
+    	      </excludes>
+              <useTransitiveDependencies>false</useTransitiveDependencies>
+    	    </dependencySet>  	         
+    	  </dependencySets>  	
+      </binaries>   
+	    
+    </moduleSet>
+    
+    <!--moduleSet>
+    	<includes>
+    		<include>org.drools:drools-documentation</include>
+    	</includes>
+    	
+      <binaries>
+        <outputDirectory>documentation</outputDirectory>
+        <outputFileNameMapping>manual</outputFileNameMapping>
+	      <unpack>true</unpack> 
+	      <unpackOptions>
+	          <includes>
+	            <include>shared/**</include>
+	            <include>html/**</include>
+	            <include>manual/html_single/**</include>
+	          </includes>    	              	      
+	          <excludes>
+	            <exclude>eclipse/**</exclude>
+	            <exclude>META-INF/**</exclude>
+	          </excludes>
+	      </unpackOptions>  	          
+      </binaries>   
+	    
+    </moduleSet-->    
+  </moduleSets>  
+
+</assembly>

Deleted: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/pre-bin_soaversion.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-brms-dist/resource/assembly/pre-bin_soaversion.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/pre-bin_soaversion.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- NOTE: SOA-P version excludes org.drools:drools-clips, org.drools:drools-transformer-*, org.drools:drools-server, 
-org.drools:drools-workitems, org.drools:drools-process-task-->
-
-<assembly>
-  <id>pre-bin</id>
-  <formats>
-    <format>dir</format>
-  </formats>
-  
-  <includeBaseDirectory>false</includeBaseDirectory>
-  
-  <fileSets>
-  
-    <fileSet>
-      <includes>
-        <include>JBossEULA.txt</include>
-        <include>README_DEPENDENCIES.txt</include>
-      </includes>
-    </fileSet>
-    
-  </fileSets>  
-
-  <moduleSets>
-    <moduleSet>
-    	<includes>
-    		<!-- note: we do not include BRMS here, as it is distributed as a single war, and a war includes all already -->
-            <include>org.drools:drools-api</include>
-    		<include>org.drools:drools-core</include>
-    		<include>org.drools:drools-compiler</include>
-    		<include>org.drools:drools-jsr94</include>
-    		<include>org.drools:drools-decisiontables</include>
-    		<include>org.drools:drools-templates</include>
-    		<!--include>org.drools:drools-clips</include-->
-            
-            
-    		<include>org.drools:drools-verifier</include>
-     		<include>org.drools:drools-ant</include>
-            <!--include>org.drools:drools-server</include-->            
-            
-            
-            <include>org.drools:drools-messenger-jms</include>
-    		<!--include>org.drools:drools-transformer-jaxb</include>
-    		<include>org.drools:drools-transformer-smooks</include>
-    		<include>org.drools:drools-transformer-jxls</include>
-    		<include>org.drools:drools-transformer-xstream</include>            
-                                           
-            
-            <include>org.drools:drools-workitems</include>
-            <include>org.drools:drools-process-task</include-->            
-            
-            <include>org.drools:drools-persistence-jpa</include>
-    	</includes>
-    	
-      <binaries>
-        <outputDirectory></outputDirectory>
-        <unpack>false</unpack> 
-        
-    	  <dependencySets>	
-    	    <dependencySet>
-    	      <outputDirectory>lib</outputDirectory>
-    	      <unpack>false</unpack>
-    	      <excludes> 
-    	         <exclude>org.drools:drools-*</exclude>
-    	      </excludes>
-              <useTransitiveDependencies>false</useTransitiveDependencies>
-    	    </dependencySet>  	         
-    	  </dependencySets>  	
-      </binaries>   
-	    
-    </moduleSet>
-    
-    <!--moduleSet>
-    	<includes>
-    		<include>org.drools:drools-documentation</include>
-    	</includes>
-    	
-      <binaries>
-        <outputDirectory>documentation</outputDirectory>
-        <outputFileNameMapping>manual</outputFileNameMapping>
-	      <unpack>true</unpack> 
-	      <unpackOptions>
-	          <includes>
-	            <include>shared/**</include>
-	            <include>html/**</include>
-	            <include>manual/html_single/**</include>
-	          </includes>    	              	      
-	          <excludes>
-	            <exclude>eclipse/**</exclude>
-	            <exclude>META-INF/**</exclude>
-	          </excludes>
-	      </unpackOptions>  	          
-      </binaries>   
-	    
-    </moduleSet-->    
-  </moduleSets>  
-
-
-
-</assembly>

Added: labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/src.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/src.xml	                        (rev 0)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/brms-distribution/resource/assembly/src.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- NOTE: SOA-P version excludes drools-clips/**, drools-solver/**, drools-process/** and drools-server/**-->
+
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+         <include>drools-api/**</include>
+         <include>drools-atom/**</include>
+         <include>drools-core/**</include>
+         <include>drools-compiler/**</include>
+         <include>drools-decisiontables/**</include>
+         <!--include>drools-clips/**</include-->
+         <include>drools-templates/**</include>
+         <include>drools-jsr94/**</include>
+         <include>drools-container/drools-mc/**</include>
+         <include>drools-persistence-jpa/**</include>
+         <include>drools-pipeline/**</include>
+         <include>drools-examples/**</include>
+         <include>drools-eclipse/**</include>
+         <include>drools-repository/**</include>
+         <include>drools-guvnor/**</include>
+         <include>drools-ant/**</include>
+	     <include>drools-verifier/**</include>
+         <include>drools-docs/**</include>
+         <!--include>drools-solver/**</include>
+         <include>drools-process/**</include>
+         <include>drools-server/**</include-->
+         <include>*.xml</include>
+         <include>*.txt</include>
+      </includes>
+      <excludes>
+        <exclude>drools-guvnor/repository/**</exclude>
+        <exclude>drools-repository/repository/**</exclude>
+        <exclude>drools-eclipse/drools-eclipse-build/local-eclipse-drop-mirror/**</exclude>
+        <exclude>drools-eclipse/org.drools.eclipse/lib/**</exclude>
+        <exclude>drools-eclipse/org.drools.eclipse/help/**</exclude>
+        <exclude>**/*.log/**</exclude>
+        <exclude>**/target/**</exclude>
+        <exclude>**/.svn/**</exclude>
+        <exclude>**/.metadata/**</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt	2010-08-12 08:38:10 UTC (rev 34664)
@@ -1 +1 @@
-5.0.2.BRMS 32440M
\ No newline at end of file
+5.0.2.BRMS 34243M
\ No newline at end of file

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/pom.xml	2010-08-12 07:22:08 UTC (rev 34663)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/pom.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -364,17 +364,40 @@
                 <module>drools-examples</module>
             </modules>
         </profile>
+        <!--For BRMS productization-->
         <profile>
             <id>brms</id>
             <modules>
-                <module>prod-brms-dist</module>    
+                <module>brms-distribution</module>    
             </modules>
+            <build>
+              <plugins>
+                <plugin>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                    <skipTests>true</skipTests>
+                  </configuration>
+                </plugin>
+              </plugins>
+            </build>
         </profile>             
+
+        <!--For SOA productization-->
         <profile>
             <id>soa</id>
             <modules>
-                <module>prod-soa-dist</module>    
+                <module>soa-distribution</module>    
             </modules>
+            <build>
+              <plugins>
+                <plugin>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                    <skipTests>true</skipTests>
+                  </configuration>
+                </plugin>
+              </plugins>
+            </build>
         </profile>             
 
         <profile>

Copied: labs/jbossrules/soa_branches/SOA5MaveniseDev/soa-distribution (from rev 34243, labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-soa-dist)

Modified: labs/jbossrules/soa_branches/SOA5MaveniseDev/soa-distribution/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/SOA5MaveniseDev/prod-soa-dist/pom.xml	2010-07-28 05:26:10 UTC (rev 34243)
+++ labs/jbossrules/soa_branches/SOA5MaveniseDev/soa-distribution/pom.xml	2010-08-12 08:38:10 UTC (rev 34664)
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <name>Drools :: Build Portions in soa-p </name>
   <groupId>org.drools</groupId>
-  <artifactId>soa-brms</artifactId>
+  <artifactId>brms-soa</artifactId>
   <version>5.0.2.BRMS</version>
   <packaging>pom</packaging>
 
@@ -52,25 +52,8 @@
         <artifactId>drools-mc</artifactId>
         <version>${project.version}</version>
       </dependency>
-
     </dependencies>
 
-  <repositories>
-    <repository>
-    <id>jawa05</id>
-    <url>http://jawa05.englab.brq.redhat.com/maven2</url>
-  </repository>
-  </repositories>
-
-    <distributionManagement>
-      <repository>
-        <id>Internal testing release</id>
-        <name>Internal testing release</name>
-        <url>scp://rzhang@jawa05.englab.brq.redhat.com:/archive/maven2</url>
-      </repository>
-    </distributionManagement>
-
-
   <!-- Plugins -->
   <build>
      <plugins>



More information about the jboss-svn-commits mailing list