[jboss-svn-commits] JBL Code SVN: r34811 - in labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise: brms-distribution/post-patch and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 20 08:39:28 EDT 2010
Author: ryanzhang
Date: 2010-08-20 08:39:27 -0400 (Fri, 20 Aug 2010)
New Revision: 34811
Added:
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/brms-engine.xml
Removed:
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/pre-bin.xml
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/revision-number.xml
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/soa-specific.xml
Modified:
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/build.xml
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/pom.xml
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/post-patch/patch_version.xml
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-eclipse/pom.xml
labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/pom.xml
Log:
Move all the old soa profile into brms-distribution module, Seperate the BRMS productized code from the project code
Modified: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/build.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/build.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/build.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -1,7 +1,7 @@
<project name="SOA jbpm console builder">
<target name="build">
- <echo file="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/version.txt">${project.version} #SVNREVERSION#</echo>
+ <echo file="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/version.txt">${project.version} </echo>
</target>
<target name="assemble">
@@ -9,9 +9,15 @@
<war destfile="${module_base_dir}/target/dist/jboss-brms.war" webxml="${module_base_dir}/target/work/drools-guvnor/WEB-INF/web.xml">
<fileset dir="${module_base_dir}/target/work/drools-guvnor" includes="**/*" />
</war>
+ <zip destfile="${module_base_dir}/target/dist/jboss-brms-engine.zip">
+ <zipfileset dir="${module_base_dir}/target/brms-engine" includes="**/*" />
+ <zipfileset file="${module_base_dir}/../LICENSE-ASL-2.0.txt" />
+ <zipfileset file="${module_base_dir}/../README_DEPENDENCIES.txt" />
+ </zip>
+ <copy tofile="${module_base_dir}/target/dist/jboss-brms-server.war" file="${module_base_dir}/target/dependency/drools-server-${project.version}.war" overwrite="true" />
- <zip destfile="${module_base_dir}/target/dist/jboss-brms-manager.zip" >
- <zipfileset dir="${module_base_dir}/target/dist" includes="*.war" />
+ <zip destfile="${module_base_dir}/target/${module_build_finalName}.zip" >
+ <zipfileset dir="${module_base_dir}/target/dist" includes="*" />
</zip>
</target>
Modified: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/pom.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/pom.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<name>Drools :: Build BRMS distribution </name>
<groupId>org.drools</groupId>
- <artifactId>BRMS</artifactId>
+ <artifactId>jboss-brms</artifactId>
<version>5.1.0</version>
<packaging>pom</packaging>
@@ -20,6 +20,7 @@
<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>
+ <brms-engine.dir>brms-engine</brms-engine.dir>
</properties>
<dependencies>
@@ -149,8 +150,9 @@
</artifactItems>
</configuration>
</execution>
+
<execution>
- <id>unpack-modules</id>
+ <id>unpack-drools-guvnor</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
@@ -166,6 +168,23 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id></id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-server</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -173,13 +192,17 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <id>brms-engine-assembly</id>
<phase>process-resources</phase>
<goals>
<goal>directory-single</goal>
</goals>
<configuration>
+ <finalName>${brms-engine.dir}</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>resource/assembly/pre-bin.xml</descriptor>
+ <descriptor>resource/assembly/brms-engine.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -195,26 +218,6 @@
</configuration>
<dependencies>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>1.7.0</version>
@@ -222,7 +225,6 @@
</dependencies>
<executions>
-
<execution>
<id>SOA build process</id>
<phase>process-classes</phase>
@@ -231,7 +233,6 @@
</goals>
<configuration>
<tasks>
- <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}"/>
Modified: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/post-patch/patch_version.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/post-patch/patch_version.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/post-patch/patch_version.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -1,21 +1,19 @@
<project name="patchname" default="apply.patch">
<target name="apply.patch">
- <!--
+ <property name='svnreversion' value='' />
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="groovy.path"/>
<groovy>
def f=new File(properties['module_base_dir']+"/.svn/entries")
+ def version_file=new File(properties['module_base_dir']+"/target/work/drools-guvnor/org.drools.guvnor.Guvnor/version.txt")
def i=0
f.eachLine{line->
i++
- if(i==4)properties['svnrevision']=line
+ if(i==4){
+ version_file.append(line)
+ }
}
</groovy>
- <replace file="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/version.txt" >
- <replacetoken>#SVNREVISION#</replacetoken>
- <replacevalue>${svnrevision}</replacevalue>
- </replace>
- -->
</target>
</project>
Copied: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/brms-engine.xml (from rev 34807, labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/pre-bin.xml)
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/brms-engine.xml (rev 0)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/brms-engine.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -0,0 +1,32 @@
+<?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>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>org.drools:drools-*</exclude>
+ </excludes>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>./</outputDirectory>
+ <includes>
+ <include>org.drools:drools-*</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Deleted: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/pre-bin.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/pre-bin.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/brms-distribution/resource/assembly/pre-bin.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -1,45 +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>
- <directory>target/license/</directory>
- <includes>
- <include>LICENSE-ASL-2.0.txt</include>
- <include>JBossORG-EULA.txt</include>
- <include>README_DEPENDENCIES.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!--outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping-->
- <excludes>
- <exclude>org.drools:drools-*</exclude>
- </excludes>
- <scope>runtime</scope>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>./</outputDirectory>
- <includes>
- <include>org.drools:drools-*</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- </dependencySets>
-
-</assembly>
Modified: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-eclipse/pom.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-eclipse/pom.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -14,36 +14,9 @@
<name>Drools :: Eclipse-Plugin</name>
<modules>
- <!--module>org.drools.eclipse</module>
+ <module>org.drools.eclipse</module>
<module>org.drools.eclipse.task</module>
- <module>drools-eclipse-build</module-->
+ <module>drools-eclipse-build</module>
</modules>
-
-
- <profiles>
- <profile>
- <id>soa</id>
- <activation>
- <property>
- <name>soa</name>
- </property>
- </activation>
- <modules>
- <module>org.drools.eclipse</module>
- <module>drools-eclipse-build</module>
- </modules>
- </profile>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>org.drools.eclipse</module>
- <module>org.drools.eclipse.task</module>
- <module>drools-eclipse-build</module>
- </modules>
- </profile>
- </profiles>
</project>
Modified: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/pom.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/pom.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -46,65 +46,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>soa</id>
- <activation>
- <property>
- <name>soa</name>
- </property>
- </activation>
- <build>
- <finalName>drools-guvnor</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <ant antfile="${basedir}/revision-number.xml" target="find_revision">
- <property name="project.version" value="${project.version}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>soa_overlay</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <ant antfile="${basedir}/soa-specific.xml" target="soa_overlay"></ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>war-it</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>war</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
<dependencies>
<!-- Internal dependencies -->
<!-- first the deps for the repo API itself (Jackrabbit based) -->
Deleted: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/revision-number.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/revision-number.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/revision-number.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project name="Drools" basedir="." default="find_revision">
- <property name="buildNumber" value="test"/>
- <property name="timestamp" value="timestamp"/>
-
- <target name="find_revision" description="Sets property 'revision.number' to the head svn revision">
-
- <property name="project.version" value="${project.version}"/>
-
- <exec executable="svnversion" outputproperty="svnlog.out" failifexecutionfails="false" >
- </exec>
-
- <condition property="svnversionDoesNotWork">
- <contains string="${svnlog.out}" substring="This client is too old" casesensitive="false" />
- </condition>
-
- <antcall target="write-version-and-build-number"/>
- <antcall target="write-version"/>
-
- </target>
-
- <!-- If svnversion works add the version and the build number -->
- <target name="write-version-and-build-number" unless="svnversionDoesNotWork">
- <touch file="./target/classes/org/drools/guvnor/public/version.txt" mkdirs="true"/>
- <echo file="./target/classes/org/drools/guvnor/public/version.txt">${project.version} ${svnlog.out}</echo>
- </target>
-
- <!-- If svnversion does not work just add the version -->
- <target name="write-version" if="svnversionDoesNotWork">
- <touch file="./target/classes/org/drools/guvnor/public/version.txt" mkdirs="true"/>
- <echo file="./target/classes/org/drools/guvnor/public/version.txt">${project.version}</echo>
- </target>
-
-</project>
Deleted: labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/soa-specific.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/soa-specific.xml 2010-08-20 11:19:57 UTC (rev 34810)
+++ labs/jbossrules/soa_branches/BRMS-SOA5.1-Mavenise/drools-guvnor/soa-specific.xml 2010-08-20 12:39:27 UTC (rev 34811)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<project name="Drools" basedir="." default="soa_overlay">
-
- <target name="soa_overlay" description="SOA specific build">
- <echo>Executing soa_overlay ...</echo>
- <replace file="target/drools-guvnor/WEB-INF/components.xml" >
- <replacetoken>security:identity authenticate-method="#{defaultAuthenticator.authenticate}"</replacetoken>
- <replacevalue>security:identity authenticate-method="#{authenticator.authenticate}" jaas-config-name="jmx-console"</replacevalue>
- </replace>
-
- <replace dir="target/drools-guvnor/org.drools.guvnor.Guvnor" >
- <include name="*.html" />
- <replacefilter token="JBoss Guvnor" value="JBoss BRMS" />
- <replacefilter token="Welcome to Guvnor" value="Welcome to BRMS" />
- <replacefilter token="Guvnor specific permissions as needed." value="BRMS specific permissions as needed." />
- <replacefilter token="Bienvenidos a Guvnor" value="Bienvenidos a BRMS" />
- <replacefilter token="Guvnor segun sus necesidades." value="BRMS segun sus necesidades." />
- </replace>
- <copy file="target/drools-guvnor/org.drools.guvnor.Guvnor/hdrlogo_brms.gif" tofile="target/drools-guvnor/org.drools.guvnor.Guvnor/header_logo.gif" overwrite="true"/>
- </target>
-</project>
More information about the jboss-svn-commits
mailing list