[jboss-svn-commits] JBL Code SVN: r34006 - in labs/jbossrules/trunk: drools-api/META-INF and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jul 18 23:41:47 EDT 2010
Author: mark.proctor at jboss.com
Date: 2010-07-18 23:41:46 -0400 (Sun, 18 Jul 2010)
New Revision: 34006
Removed:
labs/jbossrules/trunk/src/main/assembly/guvnor_soaversion.xml
Modified:
labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
labs/jbossrules/trunk/pom.xml
labs/jbossrules/trunk/src/main/assembly/bin.xml
labs/jbossrules/trunk/src/main/assembly/guvnor.xml
labs/jbossrules/trunk/src/main/assembly/pre-bin.xml
labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml
labs/jbossrules/trunk/src/main/assembly/server.xml
labs/jbossrules/trunk/src/main/assembly/soa.xml
labs/jbossrules/trunk/src/main/assembly/src.xml
labs/jbossrules/trunk/src/main/assembly/src_soaversion.xml
Log:
-fixing up assemblies, and general pom clean up around modules and profiles.
Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-07-19 03:41:46 UTC (rev 34006)
@@ -7,7 +7,7 @@
javax.xml.bind;resolution:=optional,org.osgi.framework;resolution:=op
tional;version="1.5",org.osgi.util.tracker;resolution:=optional;versi
on="1.4",org.quartz;resolution:=optional
-Bnd-LastModified: 1279481885994
+Bnd-LastModified: 1279508113203
Export-Package: org.drools.logger;uses:="org.drools.event";version="5.
1.0.SNAPSHOT",org.drools.runtime;uses:="org.drools.command,org.drools
.time,org.drools.event,org.drools,org.drools.runtime.process,org.droo
Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-07-19 03:41:46 UTC (rev 34006)
@@ -7,17 +7,15 @@
x.xml.transform,javax.xml.transform.stream,org.antlr.runtime,org.antl
r.runtime.tree,org.codehaus.janino,org.codehaus.janino.util,org.codeh
aus.janino.util.enumerator,org.codehaus.janino.util.resource,org.ecli
- pse.jdt.core.compiler;provider=jasper;version="3.3",org.eclipse.jdt.i
- nternal.compiler;provider=jasper;version="3.3",org.eclipse.jdt.intern
- al.compiler.classfmt;provider=jasper;version="3.3",org.eclipse.jdt.in
- ternal.compiler.env;provider=jasper;version="3.3",org.eclipse.jdt.int
- ernal.compiler.problem;provider=jasper;version="3.3",org.mvel2;versio
- n="2.0",org.mvel2.ast;version="2.0",org.mvel2.compiler;version="2.0",
- org.mvel2.integration;version="2.0",org.mvel2.integration.impl;versio
- n="2.0",org.mvel2.optimizers;version="2.0",org.mvel2.templates;versio
- n="2.0",org.mvel2.util;version="2.0",org.osgi.framework;version="1.5"
- ,org.osgi.util.tracker;version="1.4",org.w3c.dom,org.xml.sax
-Bnd-LastModified: 1279483556947
+ pse.jdt.core.compiler,org.eclipse.jdt.internal.compiler,org.eclipse.j
+ dt.internal.compiler.classfmt,org.eclipse.jdt.internal.compiler.env,o
+ rg.eclipse.jdt.internal.compiler.problem,org.mvel2;version="2.0",org.
+ mvel2.ast;version="2.0",org.mvel2.compiler;version="2.0",org.mvel2.in
+ tegration;version="2.0",org.mvel2.integration.impl;version="2.0",org.
+ mvel2.optimizers;version="2.0",org.mvel2.templates;version="2.0",org.
+ mvel2.util;version="2.0",org.osgi.framework;version="1.5",org.osgi.ut
+ il.tracker;version="1.4",org.w3c.dom,org.xml.sax
+Bnd-LastModified: 1279508141065
Export-Package: org.drools.builder.impl;uses:="org.drools.compiler,com
.sun.tools.xjc";version="5.1.0.SNAPSHOT",org.drools.rule.builder;uses
:="org.drools.compiler,org.mvel2.compiler,org.mvel2,org.drools.rule.b
Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-07-19 03:41:46 UTC (rev 34006)
@@ -17,7 +17,7 @@
g.mvel2.optimizers;version="2.0",org.mvel2.templates;version="2.0",or
g.mvel2.util;version="2.0",org.osgi.framework;version="1.5",org.w3c.d
om,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1279483432205
+Bnd-LastModified: 1279508128959
Export-Package: org.drools.process.core.timer;version="5.1.0.SNAPSHOT"
,org.drools.ruleflow.instance;uses:="org.drools.workflow.instance.imp
l,org.drools.workflow.instance,org.drools.ruleflow.core,org.drools.wo
Modified: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-07-19 03:41:46 UTC (rev 34006)
@@ -3,7 +3,7 @@
Created-By: 1.5.0_21 (Sun Microsystems Inc.)
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package: jxl,jxl.read.biff,org.osgi.framework;version="1.5"
-Bnd-LastModified: 1279483734088
+Bnd-LastModified: 1279508156337
Export-Package: org.drools.decisiontable;uses:="org.drools.decisiontab
le.parser.csv,org.drools.decisiontable.parser,org.drools.decisiontabl
e.parser.xls";version="5.1.0.SNAPSHOT",org.drools.decisiontable.parse
Modified: labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF 2010-07-19 03:41:46 UTC (rev 34006)
@@ -4,7 +4,7 @@
Import-Package: javax.naming,javax.persistence,javax.transaction,org.h
ibernate.annotations,org.hibernate.ejb,org.osgi.framework;version="1.
5",org.slf4j;version="1.6"
-Bnd-LastModified: 1279483625699
+Bnd-LastModified: 1279508147819
Export-Package: org.drools.persistence.processinstance.persisters;uses
:="org.drools.persistence.processinstance.variabletypes,javax.persist
ence";version="5.1.0.SNAPSHOT",org.drools.persistence.session;uses:="
Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF 2010-07-19 03:41:46 UTC (rev 34006)
@@ -4,7 +4,7 @@
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package: org.osgi.framework;version="1.5",org.w3c.dom,org.xml.s
ax
-Bnd-LastModified: 1279436728558
+Bnd-LastModified: 1279508164153
Export-Package: org.drools.bpmn2.legacy.beta1;uses:="org.drools.bpmn2.
core,org.xml.sax,org.w3c.dom,org.drools.bpmn2.legacy.beta1.di";versio
n="5.1.0.SNAPSHOT",org.drools.bpmn2;uses:="org.drools.bpmn2.legacy.be
Modified: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-07-19 03:41:46 UTC (rev 34006)
@@ -2,7 +2,7 @@
Created-By: 1.5.0_21 (Sun Microsystems Inc.)
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package: org.mvel2.templates;version="2.0"
-Bnd-LastModified: 1279483719888
+Bnd-LastModified: 1279508155151
Export-Package: org.drools.template.jdbc;uses:="org.drools.template.pa
rser";version="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.
template.parser,org.drools.template.objects";version="5.1.0.SNAPSHOT"
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/pom.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -246,33 +246,28 @@
</releases>
</pluginRepository>
</pluginRepositories>
-
+
+<!-- default modules -->
<modules>
-<module>drools-api</module>
-<module>drools-core</module>
-<module>drools-compiler</module>
-<module>drools-grid</module>
-<module>drools-pipeline</module>
-<module>drools-container</module>
-<module>drools-camel</module>
-<module>drools-simulator</module>
-<module>drools-jsr94</module>
-<module>drools-templates</module>
-<module>drools-decisiontables</module>
-<module>drools-clips</module>
-<module>drools-process</module>
-<module>drools-persistence-jpa</module>
-<module>drools-server</module>
-<module>drools-verifier</module>
-<module>drools-doc</module>
-<module>drools-ant</module>
-<module>drools-repository</module>
-<module>drools-guvnor</module>
-<module>drools-factconstraint</module>
-<module>drools-planner</module>
-<module>drools-container/drools-mc</module>
-<module>drools-ide-common</module>
-<!--module>drools-agent-jini</module-->
+ <module>drools-api</module>
+ <module>drools-core</module>
+ <module>drools-compiler</module>
+ <module>drools-grid</module>
+ <module>drools-container</module>
+ <module>drools-camel</module>
+ <module>drools-jsr94</module>
+ <module>drools-templates</module>
+ <module>drools-decisiontables</module>
+ <module>drools-process</module>
+ <module>drools-persistence-jpa</module>
+ <module>drools-server</module>
+ <module>drools-verifier</module>
+ <module>drools-doc</module>
+ <module>drools-ant</module>
+ <module>drools-repository</module>
+ <module>drools-guvnor</module>
+ <module>drools-factconstraint</module>
+ <module>drools-ide-common</module>
</modules>
<profiles>
@@ -340,30 +335,11 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>osgi-bundles</module>
- <module>drools-api</module>
- <module>drools-core</module>
- <module>drools-compiler</module>
- <module>drools-simulator</module>
- <module>drools-jsr94</module>
- <module>drools-templates</module>
- <module>drools-decisiontables</module>
<module>drools-clips</module>
+ <module>drools-planner</module>
<module>drools-pipeline</module>
- <module>drools-process</module>
- <!-- <module>drools-atom</module> -->
- <!-- <module>drools-bpel</module>
- <module>drools-jpdl</module>
- <module>drools-osworkflow</module> -->
- <module>drools-server</module>
- <module>drools-verifier</module>
- <module>drools-doc</module>
- <module>drools-ant</module>
- <module>drools-repository</module>
- <module>drools-guvnor</module>
- <module>drools-factconstraint</module>
- <module>drools-planner</module>
- <module>drools-container/drools-mc</module>
+ <module>drools-simulator</module>
+ <module>osgi-bundles</module>
</modules>
<build>
<pluginManagement>
@@ -392,7 +368,8 @@
</plugins>
</pluginManagement>
</build>
- </profile>
+ </profile>
+
<profile>
<id>documentation</id>
<activation>
@@ -416,6 +393,7 @@
<module>drools-eclipse</module>
</modules>
</profile>
+
<profile>
<id>release</id>
<activation>
@@ -430,6 +408,7 @@
<module>drools-examples</module>
</modules>
</profile>
+
<profile>
<id>cibuild</id>
<activation>
@@ -444,6 +423,7 @@
<module>drools-examples</module>
</modules>
</profile>
+
<profile>
<id>soa</id>
<activation>
@@ -451,26 +431,6 @@
<name>soa</name>
</property>
</activation>
- <modules>
- <module>drools-api</module>
- <module>drools-core</module>
- <module>drools-compiler</module>
- <module>drools-jsr94</module>
- <!--module>drools-templates</module-->
- <module>drools-decisiontables</module>
- <!--module>drools-clips</module>
- <module>drools-pipeline</module>
- <module>drools-process</module>
- <module>drools-server</module-->
- <module>drools-verifier</module>
- <module>drools-doc</module>
- <module>drools-ant</module>
- <module>drools-repository</module>
- <module>drools-guvnor</module>
- <module>drools-factconstraint</module>
- <!--module>drools-planner</module-->
- <module>drools-container/drools-mc</module>
- </modules>
<build>
<pluginManagement>
<plugins>
@@ -481,7 +441,9 @@
<descriptors>
<descriptor>src/main/assembly/pre-bin_soaversion.xml</descriptor>
<descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/guvnor_soaversion.xml</descriptor>
+ <descriptor>src/main/assembly/guvnor.xml</descriptor>
+ <descriptor>src/main/assembly/install.xml</descriptor>
+ <descriptor>src/main/assembly/gwt-console.xml</descriptor>
<descriptor>src/main/assembly/server.xml</descriptor>
<descriptor>src/main/assembly/src_soaversion.xml</descriptor>
<descriptor>src/main/assembly/eclipse.xml</descriptor>
Modified: labs/jbossrules/trunk/src/main/assembly/bin.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/bin.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/bin.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -10,7 +10,7 @@
<fileSets>
<fileSet>
- <directory>target/drools-${project.version}-pre-bin.dir</directory>
+ <directory>target/drools-${project.version}-pre-bin</directory>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
Modified: labs/jbossrules/trunk/src/main/assembly/guvnor.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/guvnor.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/guvnor.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -2,16 +2,20 @@
<assembly>
<id>guvnor</id>
<formats>
- <format>zip</format>
+ <format>war</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>drools-guvnor/target/drools-guvnor</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
- <!-- We include the BRMS specifically, as its a single atomic war -->
- <files>
- <file>
- <source>drools-guvnor/target/drools-guvnor.war</source>
- </file>
- </files>
-
</assembly>
Deleted: labs/jbossrules/trunk/src/main/assembly/guvnor_soaversion.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/guvnor_soaversion.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/guvnor_soaversion.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -1,18 +0,0 @@
-<?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/trunk/src/main/assembly/pre-bin.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/pre-bin.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/pre-bin.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -33,8 +33,7 @@
<include>org.drools:drools-bam</include>
<include>org.drools:drools-verifier</include>
<include>org.drools:drools-ant</include>
- <include>org.drools:drools-assistant</include>
- <include>org.drools:drools-atom</include>
+ <!--include>org.drools:drools-assistant</include-->
<include>org.drools:drools-spring</include>
<include>org.drools:drools-doc</include>
<include>org.drools:drools-camel</include>
Modified: labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -34,13 +34,10 @@
<include>org.drools:drools-bam</include>
<include>org.drools:drools-verifier</include>
<include>org.drools:drools-ant</include>
- <include>org.drools:drools-assistant</include>
- <include>org.drools:drools-atom</include>
<include>org.drools:drools-spring</include>
<include>org.drools:drools-doc</include>
<include>org.drools:drools-camel</include>
<include>org.drools:drools-bpmn2</include>
- <include>org.drools:drools-simulator</include>
<include>org.drools:drools-grid-core</include>
<include>org.drools:drools-workitems</include>
<include>org.drools:drools-process-task</include>
Modified: labs/jbossrules/trunk/src/main/assembly/server.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/server.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/server.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -1,17 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
- <id>guvnor</id>
+ <id>drools-server</id>
<formats>
- <format>zip</format>
+ <format>war</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <!-- We include the BRMS specifically, as its a single atomic war -->
- <files>
- <file>
- <source>drools-server/target/drools-server.war</source>
- </file>
- </files>
+ <fileSets>
+ <fileSet>
+ <directory>drools-server/target/drools-server</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
</assembly>
Modified: labs/jbossrules/trunk/src/main/assembly/soa.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/soa.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/soa.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -10,10 +10,14 @@
<!-- We include the BRMS specifically, as its a single atomic war -->
<files>
<file>
- <source>./target/drools-${project.version}-guvnor.zip</source>
- <destName>jboss-brms-manager.zip</destName>
+ <source>./target/drools-${project.version}-guvnor.war</source>
+ <destName>jboss-brms-manager.war</destName>
</file>
<file>
+ <source>./target/drools-${project.version}-server.war</source>
+ <destName>jboss-brms-server.war</destName>
+ </file>
+ <file>
<source>./target/drools-${project.version}-bin.zip</source>
<destName>jboss-brms-engine.zip</destName>
</file>
Modified: labs/jbossrules/trunk/src/main/assembly/src.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/src.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/src.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -13,9 +13,7 @@
<outputDirectory></outputDirectory>
<includes>
<include>drools-ant/**</include>
- <include>drools-api/**</include>
- <include>drools-assistant/**</include>
- <include>drools-atom/**</include>
+ <include>drools-api/**</include>
<include>drools-camel/**</include>
<include>drools-clips/**</include>
<include>drools-compiler/**</include>
Modified: labs/jbossrules/trunk/src/main/assembly/src_soaversion.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/src_soaversion.xml 2010-07-18 22:45:52 UTC (rev 34005)
+++ labs/jbossrules/trunk/src/main/assembly/src_soaversion.xml 2010-07-19 03:41:46 UTC (rev 34006)
@@ -17,10 +17,7 @@
<includes>
<include>drools-ant/**</include>
<include>drools-api/**</include>
- <include>drools-assistant/**</include>
- <include>drools-atom/**</include>
<include>drools-camel/**</include>
- <include>drools-clips/**</include>
<include>drools-compiler/**</include>
<include>drools-container/**</include>
<include>drools-core/**</include>
@@ -35,18 +32,15 @@
<include>drools-ide-common/**</include>
<include>drools-jsr94/**</include>
<include>drools-persistence-jpa/**</include>
- <include>drools-pipeline/**</include>
- <include>drools-planner/**</include>
<include>drools-process/**</include>
<include>drools-repository/**</include>
<include>drools-rhq-plugin/**</include>
<include>drools-server/**</include>
- <include>drools-simulator/**</include>
<include>drools-templates/**</include>
<include>drools-verifier/**</include>
<include>*.xml</include>
<include>*.txt</include>
- </includes>
+ </includes
<excludes>
<exclude>drools-guvnor/repository/**</exclude>
<exclude>drools-repository/repository/**</exclude>
More information about the jboss-svn-commits
mailing list