[jbpm-commits] JBoss JBPM SVN: r1994 - in jbpm3/trunk: modules and 11 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-08-25 07:44:37 -0400 (Mon, 25 Aug 2008) New Revision: 1994 Removed: jbpm3/trunk/modules/bamconsole/ Modified: jbpm3/trunk/modules/console/.classpath jbpm3/trunk/modules/distribution/.classpath jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/enterprise/.classpath jbpm3/trunk/modules/jbpm4jsf/.classpath jbpm3/trunk/modules/jpdl/core/.classpath jbpm3/trunk/modules/jpdl/db/.classpath jbpm3/trunk/modules/jpdl/examples/.classpath jbpm3/trunk/modules/jpdl/identity/.classpath jbpm3/trunk/modules/jpdl/identity/pom.xml jbpm3/trunk/modules/jpdl/pom.xml jbpm3/trunk/modules/jpdl/simulation/.classpath jbpm3/trunk/modules/jpdl/simulation/pom.xml jbpm3/trunk/modules/jpdl/userguide/.classpath jbpm3/trunk/pom.xml Log: Fixing the build. Remove modules bamconsole, ws. [JBPM-1292] [JBPM-1401] Modified: jbpm3/trunk/modules/console/.classpath =================================================================== --- jbpm3/trunk/modules/console/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/console/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path=""/> + <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="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/distribution/.classpath =================================================================== --- jbpm3/trunk/modules/distribution/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/distribution/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-08-25 11:44:37 UTC (rev 1994) @@ -10,172 +10,162 @@ <!-- ====================================================================== --> <!-- $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 jBPM - Distribution</name> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-distribution</artifactId> + <packaging>pom</packaging> -<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 jBPM - Distribution</name> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-distribution</artifactId> - <packaging>pom</packaging> - <!-- Parent --> - <parent> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-bam-console-ear</artifactId> - <version>${version}</version> - <type>ear</type> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-core</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-console</artifactId> - <version>${version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-console</artifactId> - <classifier>login</classifier> - <version>${version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-identity</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-identity</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>izpack</groupId> - <artifactId>standalone-compiler</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>jboss-bpm-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-core</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <version>${version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <classifier>login</classifier> + <version>${version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-identity</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-identity</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>izpack</groupId> + <artifactId>standalone-compiler</artifactId> + </dependency> + </dependencies> <!-- Plugins --> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>directory-single</goal> - </goals> - <configuration> - <finalName>deploy-artifacts</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>jbpm config</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="scripts/antrun-jbpm-config.xml"/> - </tasks> - </configuration> - </execution> - <execution> - <id>installer</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="product.name" value="${project.name}" /> - <property name="product.short.name" value="${artifactId}" /> - <property name="product.version" value="${project.version}" /> - <property name="jboss421.home" value="${jboss421.home}" /> - <property name="jboss422.home" value="${jboss422.home}" /> - <property name="jboss500.home" value="${jboss500.home}" /> - <property name="jboss501.home" value="${jboss501.home}" /> - <ant antfile="scripts/antrun-installer.xml" target="installer" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-core</artifactId> - <version>${version}</version> - <classifier>config</classifier> - <type>jar</type> - <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-core</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-identity</artifactId> - <version>${version}</version> - <classifier>config</classifier> - <type>jar</type> - <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-identity</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-console</artifactId> - <version>${version}</version> - <classifier>login</classifier> - <type>jar</type> - <outputDirectory>${project.build.directory}/resources/jbpm-login</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>deploy-artifacts</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>jbpm config</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="scripts/antrun-jbpm-config.xml" /> + </tasks> + </configuration> + </execution> + <execution> + <id>installer</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="product.name" value="${project.name}" /> + <property name="product.short.name" value="${artifactId}" /> + <property name="product.version" value="${project.version}" /> + <property name="jboss421.home" value="${jboss421.home}" /> + <property name="jboss422.home" value="${jboss422.home}" /> + <property name="jboss500.home" value="${jboss500.home}" /> + <property name="jboss501.home" value="${jboss501.home}" /> + <ant antfile="scripts/antrun-installer.xml" target="installer" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-core</artifactId> + <version>${version}</version> + <classifier>config</classifier> + <type>jar</type> + <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-core</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-identity</artifactId> + <version>${version}</version> + <classifier>config</classifier> + <type>jar</type> + <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-identity</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <version>${version}</version> + <classifier>login</classifier> + <type>jar</type> + <outputDirectory>${project.build.directory}/resources/jbpm-login</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Modified: jbpm3/trunk/modules/enterprise/.classpath =================================================================== --- jbpm3/trunk/modules/enterprise/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/enterprise/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/jbpm4jsf/.classpath =================================================================== --- jbpm3/trunk/modules/jbpm4jsf/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jbpm4jsf/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/jpdl/core/.classpath =================================================================== --- jbpm3/trunk/modules/jpdl/core/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/core/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/jpdl/db/.classpath =================================================================== --- jbpm3/trunk/modules/jpdl/db/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/db/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/jpdl/examples/.classpath =================================================================== --- jbpm3/trunk/modules/jpdl/examples/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/examples/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/jpdl/identity/.classpath =================================================================== --- jbpm3/trunk/modules/jpdl/identity/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/identity/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/jpdl/identity/pom.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-08-25 11:44:37 UTC (rev 1994) @@ -35,7 +35,6 @@ <artifactId>jbpm-jpdl-core</artifactId> <version>${version}</version> </dependency> - <dependency> <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-jpdl-core</artifactId> @@ -43,6 +42,13 @@ <version>${version}</version> </dependency> + <!-- Provided Dependencies --> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <scope>provided</scope> + </dependency> + <!-- Test Dependencies --> <dependency> <groupId>hsqldb</groupId> @@ -152,4 +158,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: jbpm3/trunk/modules/jpdl/pom.xml =================================================================== --- jbpm3/trunk/modules/jpdl/pom.xml 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/pom.xml 2008-08-25 11:44:37 UTC (rev 1994) @@ -36,7 +36,6 @@ <module>identity</module> <module>simulation</module> <module>userguide</module> - <module>ws</module> </modules> </project> \ No newline at end of file Modified: jbpm3/trunk/modules/jpdl/simulation/.classpath =================================================================== --- jbpm3/trunk/modules/jpdl/simulation/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/simulation/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/jpdl/simulation/pom.xml =================================================================== --- jbpm3/trunk/modules/jpdl/simulation/pom.xml 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/simulation/pom.xml 2008-08-25 11:44:37 UTC (rev 1994) @@ -44,6 +44,12 @@ <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> + <exclusions> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>dom4j</groupId> Modified: jbpm3/trunk/modules/jpdl/userguide/.classpath =================================================================== --- jbpm3/trunk/modules/jpdl/userguide/.classpath 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/modules/jpdl/userguide/.classpath 2008-08-25 11:44:37 UTC (rev 1994) @@ -2,5 +2,5 @@ <classpath> <classpathentry kind="src" path=""/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-08-25 10:45:32 UTC (rev 1993) +++ jbpm3/trunk/pom.xml 2008-08-25 11:44:37 UTC (rev 1994) @@ -31,12 +31,10 @@ <module>modules/console</module> <module>modules/enterprise</module> <module>modules/jbpm4jsf</module> - <module>modules/bamconsole</module> </modules> <!-- Properties --> <properties> - <jboss.jbpm.api.version>1.0.0-SNAPSHOT</jboss.jbpm.api.version> <apache.ant.version>1.7.0</apache.ant.version> <apache.cactus.version>1.8.0</apache.cactus.version> <apache.jackrabbit.version>1.4.5</apache.jackrabbit.version> @@ -67,6 +65,7 @@ <javax.persistence.version>1.0</javax.persistence.version> <javax.jaxb.version>2.1</javax.jaxb.version> <jaxen.version>1.1.1</jaxen.version> + <jboss.bpm.api.version>1.0.0.Alpha1</jboss.bpm.api.version> <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <jboss.seam.version>2.0.2.GA</jboss.seam.version> <junit.version>3.8.1</junit.version> @@ -81,15 +80,15 @@ <dependencies> <!-- jBPM Dependencies --> <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-api</artifactId> - <version>${jboss.jbpm.api.version}</version> + <groupId>org.jboss.bpm</groupId> + <artifactId>jboss-bpm-api</artifactId> + <version>${jboss.bpm.api.version}</version> </dependency> <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>jboss-bpm-api</artifactId> <classifier>testsuite</classifier> - <version>${jboss.jbpm.api.version}</version> + <version>${jboss.bpm.api.version}</version> <type>zip</type> </dependency> @@ -103,7 +102,6 @@ <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>${facelets.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>commons-fileupload</groupId>