[jbpm-commits] JBoss JBPM SVN: r4184 - in jbpm3/branches/jbpm-3.2.5.SP: modules/distribution and 4 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-03-07 02:03:51 -0500 (Sat, 07 Mar 2009) New Revision: 4184 Removed: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/java/org/jbpm/enterprise/deployment/ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.classpath jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.project jbpm3/branches/jbpm-3.2.5.SP/modules/integration/deploy.sh jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/integration/scripts/ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/src/ Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml jbpm3/branches/jbpm-3.2.5.SP/pom.xml Log: merge r3646 from trunk - remove gwt-console integration Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-03-07 07:03:51 UTC (rev 4184) @@ -29,17 +29,6 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-spec</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-spec</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-db</artifactId> <version>${version}</version> </dependency> @@ -101,19 +90,6 @@ <version>${version}</version> <type>jdocbook</type> </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-integration-jboss42</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-integration-jboss42</artifactId> - <classifier>config</classifier> - </dependency> <!-- jBPM Projects --> <dependency> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-03-07 07:03:51 UTC (rev 4184) @@ -50,15 +50,6 @@ </includes> <unpack>true</unpack> </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-integration-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:bpm-spec-integration-jboss42:jar:config</include> - <include>*:jbpm-integration-spec:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> <!-- sources --> <dependencySet> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml 2009-03-07 07:03:51 UTC (rev 4184) @@ -164,10 +164,7 @@ <include name="dom4j.jar" /> <include name="hibernate.jar" /> <include name="hsqldb.jar" /> - <include name="bpm-spec-api.jar" /> - <include name="bpm-spec-integration-jboss42.jar" /> <include name="jbpm-enterprise-bundle.ear" /> - <include name="jbpm-integration-spec.jar"/> <include name="jbpm-jpdl.jar" /> <include name="jbpm-identity.jar" /> <include name="junit.jar" /> @@ -200,14 +197,6 @@ <description>The jBPM3 JBoss Integration</description> - <!-- jbpm/jbpm-integration.beans --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans" override="true"> - <include name="jbpm-integration-spec.jar" /> - </fileset> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-integration-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans/META-INF" override="true"> - <include name="jboss-beans.xml" /> - </fileset> - <!-- jbpm/jbpm-service.sar --> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm.cfg.xml" /> @@ -219,8 +208,6 @@ </fileset> --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="bpm-spec-api.jar" /> - <include name="bpm-spec-integration-jboss42.jar" /> <include name="jbpm-jpdl.jar" /> <include name="jbpm-identity.jar" /> <include name="slf4j-api.jar" /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-03-07 07:03:51 UTC (rev 4184) @@ -20,7 +20,7 @@ <spec> <choice txt="Hypersonic" value="hsqldb"/> <choice txt="MySQL" value="mysql" set="true"/> - <!-- choice txt="PostgreSQL" value="postgresql"/--> + <choice txt="PostgreSQL" value="postgresql"/> <choice txt="Sybase" value="sybase"/> </spec> </field> @@ -31,4 +31,4 @@ <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> </field> </panel> -</userInput> \ No newline at end of file +</userInput> Deleted: jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.classpath =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.classpath 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.classpath 2009-03-07 07:03:51 UTC (rev 4184) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.project =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.project 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/.project 2009-03-07 07:03:51 UTC (rev 4184) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbpm-integration-spec</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Deleted: jbpm3/branches/jbpm-3.2.5.SP/modules/integration/deploy.sh =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/integration/deploy.sh 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/deploy.sh 2009-03-07 07:03:51 UTC (rev 4184) @@ -1,6 +0,0 @@ -#! /bin/bash - -mvn -o install - -rm $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans/jbpm-integration-spec*.jar -cp target/jbpm-integration-spec-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans Deleted: jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml 2009-03-07 07:03:51 UTC (rev 4184) @@ -1,225 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<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>JBoss jBPM3 - Integration</name> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-spec</artifactId> - <packaging>jar</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm</artifactId> - <version>3.2.5.SP3</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <!-- Properties --> - <properties> - <jboss.version>4.2.2.GA</jboss.version> - <mvel.version>1.3.7-java1.5</mvel.version> - </properties> - - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-api</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-identity</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-identity</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.mvel</groupId> - <artifactId>mvel</artifactId> - <version>${mvel.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jbossall-client</artifactId> - <version>${jboss.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-cts</artifactId> - <scope>test</scope> - <type>zip</type> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/cts/resources</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>src/cts</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-test-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> - <ant antfile="scripts/antrun-test-jars.xml" target="build-test-jars" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>assembly-config</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>${project.build.finalName}</finalName> - <appendAssemblyId>true</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-config.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>src/cts</directory> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-cts</artifactId> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>src/cts</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>bpm-spec-jbpm3-beans.xml</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>bpm.dialect</name> - <value>jbpm3</value> - </property> - <property> - <name>bpm.dialect.uri</name> - <value>urn:jbpm.org:jpdl-3.2</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${basedir}/target</value> - </property> - </systemProperties> - <excludes> - <exclude>org/jboss/bpm/incubator/**/*Test.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - - <!-- Profiles --> - <profiles> - </profiles> - -</project> Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-03-06 20:33:18 UTC (rev 4183) +++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-03-07 07:03:51 UTC (rev 4184) @@ -32,7 +32,6 @@ <module>modules/enterprise</module> <module>modules/examples</module> <module>modules/simulation</module> - <module>modules/integration</module> <!-- Execute as part of -Pdistro <module>modules/db</module> @@ -126,28 +125,6 @@ <artifactId>bpm-spec-api</artifactId> <version>${bpm.spec.version}</version> </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-dialect-api10</artifactId> - <version>${bpm.spec.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-integration-jboss42</artifactId> - <version>${bpm.spec.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-integration-jboss42</artifactId> - <classifier>config</classifier> - <version>${bpm.spec.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-cts</artifactId> - <version>${bpm.spec.version}</version> - <type>zip</type> - </dependency> <!-- Thirdparty Dependencies --> <dependency>