[jbpm-commits] JBoss JBPM SVN: r6285 - in jbpm4/trunk: modules/db/src/main/java/org/jbpm/db and 2 other directories.

Author: alex.guizar(a)jboss.com Date: 2010-04-28 00:33:08 -0400 (Wed, 28 Apr 2010) New Revision: 6285 Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java jbpm4/trunk/modules/migration/pom.xml jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/pom.xml Log: JBPM-2844: upgrade to activation 1.1.1 migrate to maven nexus repo Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java =================================================================== --- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java 2010-04-28 02:52:18 UTC (rev 6284) +++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Create.java 2010-04-28 04:33:08 UTC (rev 6285) @@ -55,9 +55,9 @@ .buildProcessEngine(); try { - processEngine.execute(new Command<Object>(){ + processEngine.execute(new Command<Void>(){ private static final long serialVersionUID = 1L; - public Object execute(Environment environment) throws Exception { + public Void execute(Environment environment) throws Exception { Session session = environment.get(Session.class); DbHelper.executeSqlResource("create/jbpm."+database+".create.sql", session); PropertyImpl.createProperties(session); Modified: jbpm4/trunk/modules/migration/pom.xml =================================================================== --- jbpm4/trunk/modules/migration/pom.xml 2010-04-28 02:52:18 UTC (rev 6284) +++ jbpm4/trunk/modules/migration/pom.xml 2010-04-28 04:33:08 UTC (rev 6285) @@ -1,76 +1,74 @@ <?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. --> <!-- --> -<!-- ====================================================================== ---> +<!-- ====================================================================== --> <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <modelVersion>4.0.0</modelVersion> + <name>jBPM 4 - Migration - Tool</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jpdl-migration</artifactId> + <packaging>jar</packaging> - <name>jBPM 4 - Migration - Tool</name> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jpdl-migration</artifactId> - <packaging>jar</packaging> + <!-- Parent --> + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> - <!-- Parent --> - <parent> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm</artifactId> - <version>4.4-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <!-- Dependencies --> - <dependencies> + <!-- Dependencies --> + <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${project.version}</version> - </dependency> + </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + </dependencies> - <!-- Profiles --> - <profiles> - - <!-- skip tests if this is an integration test run - (only examples and test-db are part of the integration test runs) --> + <!-- Profiles --> + <profiles> + <!-- + skip tests if this is an integration test run (only examples and test-db are part of the + integration test runs) + --> <profile> <id>skip.tests.during.database.testrun</id> <activation> @@ -83,60 +81,48 @@ </properties> </profile> - <profile> - <id>distro</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <finalName>jbpm-migration</finalName> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - <mainClass>org.jbpm.jpdl.internal.convert.JpdlConverterTool</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <!--version>2.2-beta-3</version--> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>migration-distro</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-distro.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profile> + <id>distro</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <finalName>jbpm-migration</finalName> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + <mainClass>org.jbpm.jpdl.internal.convert.JpdlConverterTool</mainClass> + </manifest> + </archive> + </configuration> + </plugin> - <pluginRepositories> - <pluginRepository> - <id>codehaus</id> - <name>codehaus</name> - <url>http://repository.codehaus.org - </url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <!--version>2.2-beta-3</version--> + <executions> + <execution> + <id>distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>migration-distro</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-distro.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2010-04-28 02:52:18 UTC (rev 6284) +++ jbpm4/trunk/modules/pvm/pom.xml 2010-04-28 04:33:08 UTC (rev 6285) @@ -12,7 +12,7 @@ <!-- $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"> + 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>jBPM 4 - PVM</name> @@ -28,14 +28,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <repositories> - <repository> - <id>Snapshot</id> - <name>JBoss Snapshot</name> - <url>http://snapshots.jboss.org/maven2/</url> - </repository> - </repositories> - <!-- Dependencies --> <dependencies> <dependency> @@ -77,8 +69,8 @@ <artifactId>bsh</artifactId> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -132,7 +124,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -215,7 +207,7 @@ </plugins> </reporting> </profile> - + <!-- skip tests if this is an integration test run (only examples and test-db are part of the integration test runs) --> <profile> @@ -229,6 +221,18 @@ <skipTests>true</skipTests> </properties> </profile> + + <profile> + <id>jdk15</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + </dependencies> + </profile> </profiles> - </project> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2010-04-28 02:52:18 UTC (rev 6284) +++ jbpm4/trunk/pom.xml 2010-04-28 04:33:08 UTC (rev 6285) @@ -12,22 +12,22 @@ <!-- $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"> - + 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>jBPM 4</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm</artifactId> + <version>4.4-SNAPSHOT</version> <packaging>pom</packaging> - <version>4.4-SNAPSHOT</version> + <!-- Parent --> + <parent> + <artifactId>jbpm-parent</artifactId> + <groupId>org.jbpm</groupId> + <version>1.0.3</version> + </parent> - <organization> - <name>JBoss, a division of Red Hat</name> - <url>http://www.jboss.org</url> - </organization> - <!-- Modules --> <modules> <module>modules/log</module> @@ -45,7 +45,6 @@ <!-- Properties --> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <apache.ant.version>1.7.0</apache.ant.version> <beanshell.version>2.0b5</beanshell.version> <groovy.version>1.5.6</groovy.version> @@ -73,19 +72,19 @@ <signavio.jbpmeditor.version>1.1</signavio.jbpmeditor.version> <spring.version>2.0.8</spring.version> <stax.api.version>1.0.1</stax.api.version> - <wiser.version>1.2</wiser.version> + <wiser.version>1.2</wiser.version> <woodstox.version>3.2.6</woodstox.version> <mysql.connector.version>5.0.8</mysql.connector.version> <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> <oracle.version>10.2.0.4</oracle.version> <cdi.version>1.0</cdi.version> - </properties> + <activation.version>1.1.1</activation.version> + </properties> <!-- DependencyManagement --> <dependencyManagement> <dependencies> - <!-- Core engine components --> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -164,31 +163,31 @@ <artifactId>jbpm-tomcat6</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-console-integration</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-console-form-plugin</artifactId> - <version>${project.version}</version> - </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-console-graphView-plugin</artifactId> - <version>${project.version}</version> - </dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-console-integration</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-console-form-plugin</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-console-graphView-plugin</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-console-reports</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jboss4</artifactId> - <version>${project.version}</version> - </dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jboss4</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-gpd</artifactId> @@ -204,12 +203,12 @@ <!-- External dependencies --> <!-- Please sort by groupid --> - <dependency> - <groupId>aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${aspectjrt.version}</version> - </dependency> <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>${aspectjrt.version}</version> + </dependency> + <dependency> <groupId>cactus</groupId> <artifactId>cactus.core</artifactId> <version>${cactus.version}</version> @@ -240,10 +239,12 @@ <version>${juel.version}</version> </dependency> <dependency> - <!-- The juel engine is the library from scripting.java.sun.com that exposes juel as a jsr233 scripting engine. - It's not part of the juel distribution. For some reason i don't recall, we uploaded it as - an juel-engine artifact in the group juel. And more problematic, used the juel version (2.1.0) for it. - That is not intuitive. --> + <!-- + The juel engine is the library from scripting.java.sun.com that exposes juel as a + jsr233 scripting engine. It's not part of the juel distribution. For some reason i + don't recall, we uploaded it as an juel-engine artifact in the group juel. And more + problematic, used the juel version (2.1.0) for it. That is not intuitive. + --> <groupId>juel</groupId> <artifactId>juel-engine</artifactId> <version>${juel.engine.version}</version> @@ -264,6 +265,16 @@ <version>${log4j.version}</version> </dependency> <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${activation.version}</version> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${cdi.version}</version> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>${mail.version}</version> @@ -300,9 +311,9 @@ <version>${report.engine.version}</version> </dependency> <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>${freemarker.version}</version> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>${freemarker.version}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -338,23 +349,23 @@ <artifactId>gwt-console-server-integration</artifactId> <version>${gwt.console.version}</version> </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>gwt-console-rpc</artifactId> - <version>${gwt.console.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.errai</groupId> - <artifactId>errai-common</artifactId> - <version>${errai.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.errai</groupId> - <artifactId>errai-bus</artifactId> - <version>${errai.version}</version> - </dependency> <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-rpc</artifactId> + <version>${gwt.console.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-common</artifactId> + <version>${errai.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-bus</artifactId> + <version>${errai.version}</version> + </dependency> + <dependency> <groupId>org.jboss.javaee</groupId> <artifactId>jboss-javaee</artifactId> <version>${jboss.client.version}</version> @@ -396,11 +407,6 @@ <version>${wiser.version}</version> </dependency> <dependency> - <groupId>org.subethamail</groupId> - <artifactId>subethasmtp-smtp</artifactId> - <version>${wiser.version}</version> - </dependency> - <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-lgpl</artifactId> <version>${woodstox.version}</version> @@ -427,34 +433,9 @@ <artifactId>jtds</artifactId> <version>${jtds.version}</version> </dependency> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>${cdi.version}</version> - </dependency> </dependencies> </dependencyManagement> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/jbpm4</conne... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/jbpm4<... - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm4</url> - </scm> - - <!-- IssueManagement --> - <issueManagement> - <system>jira</system> - <url>http://jira.jboss.org/jira/browse/JBPM</url> - </issueManagement> - - <!-- Licenses --> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <!-- Plugins --> <build> <plugins> @@ -480,42 +461,6 @@ </configuration> </plugin> </plugins> - - <!-- PluginManagement --> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2.SP1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-1</version> - </plugin> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.3</version> - </plugin> - </plugins> - </pluginManagement> </build> <profiles> @@ -738,89 +683,5 @@ <module>modules/test-load</module> </modules> </profile> - </profiles> - - <!-- Repositories --> - <repositories> - <repository> - <id>maven1.java.net</id> - <url>http://download.java.net/maven/1/</url> - <layout>legacy</layout> - </repository> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.com/maven2</url> - <snapshots> - <enabled>false</enabled> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <url>http://snapshots.jboss.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - </repository> - <repository> - <id>repository.codehaus.org</id> - <url>http://repository.codehaus.org</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>maven2.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2/</url> - </repository> - <repository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </repository> - </repositories> - - <!-- PluginRepositories --> - <pluginRepositories> - <pluginRepository> - <id>maven2.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2/</url> - </pluginRepository> - <pluginRepository> - <id>repository.jboss.com</id> - <url>http://repository.jboss.com/maven2</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>snapshots.jboss.org</id> - <url>http://snapshots.jboss.org/maven2</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </pluginRepository> - </pluginRepositories> - - <!-- DistributionManagement --> - <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Maven Repository</name> - <url>file://${jboss.maven.repository}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> - </project>