[jbpm-commits] JBoss JBPM SVN: r4169 - in jbpm3/branches/jbpm-3.2.6.GA: hudson/hudson-home and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-03-06 10:17:23 -0500 (Fri, 06 Mar 2009) New Revision: 4169 Modified: jbpm3/branches/jbpm-3.2.6.GA/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2.6.GA/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2.6.GA/pom.xml Log: Remove dependency on slf4j Modified: jbpm3/branches/jbpm-3.2.6.GA/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2.6.GA/hudson/hudson-home/command.sh 2009-03-06 14:31:43 UTC (rev 4168) +++ jbpm3/branches/jbpm-3.2.6.GA/hudson/hudson-home/command.sh 2009-03-06 15:17:23 UTC (rev 4169) @@ -66,18 +66,7 @@ rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml -if [ $CONTAINER = "jboss500" ]; then - rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/slf4j-api.jar -fi -# FIXME: find out whether jTDS can be made to work with XA data source -# https://jira.jboss.org/jira/browse/JBPM-1818 -SYBASE_JDBC_DRIVER=~/.m2/repository/com/sybase/jconnect/6.0.5/jconnect-6.0.5.jar -if [ -f $SYBASE_JDBC_DRIVER ]; then - echo "cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" - cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar -fi - # # start jbossas # Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml 2009-03-06 14:31:43 UTC (rev 4168) +++ jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml 2009-03-06 15:17:23 UTC (rev 4169) @@ -79,22 +79,11 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> <!-- Test Dependencies --> <dependency> @@ -107,11 +96,6 @@ <artifactId>jaxen</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> <!-- Remove this static dependency --> <dependency> Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/pom.xml 2009-03-06 14:31:43 UTC (rev 4168) +++ jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/pom.xml 2009-03-06 15:17:23 UTC (rev 4169) @@ -154,14 +154,6 @@ <type>zip</type> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/src/main/resources/installer/install-definition.xml 2009-03-06 14:31:43 UTC (rev 4168) +++ jbpm3/branches/jbpm-3.2.6.GA/modules/distribution/src/main/resources/installer/install-definition.xml 2009-03-06 15:17:23 UTC (rev 4169) @@ -169,8 +169,6 @@ <include name="jbpm-identity.jar" /> <include name="junit.jar" /> <include name="jsf-console.war" /> - <include name="slf4j-api.jar" /> - <include name="slf4j-log4j12.jar" /> <include name="log4j.jar" /> </fileset> @@ -205,8 +203,6 @@ <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm-jpdl.jar" /> <include name="jbpm-identity.jar" /> - <include name="slf4j-api.jar" /> - <include name="slf4j-log4j12.jar" /> </fileset> <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-identity-service.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" unpack="true" override="true" /> Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.6.GA/modules/enterprise/pom.xml 2009-03-06 14:31:43 UTC (rev 4168) +++ jbpm3/branches/jbpm-3.2.6.GA/modules/enterprise/pom.xml 2009-03-06 15:17:23 UTC (rev 4169) @@ -95,11 +95,6 @@ <artifactId>bpm-spec-api</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <!-- Plugins --> Modified: jbpm3/branches/jbpm-3.2.6.GA/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.6.GA/pom.xml 2009-03-06 14:31:43 UTC (rev 4168) +++ jbpm3/branches/jbpm-3.2.6.GA/pom.xml 2009-03-06 15:17:23 UTC (rev 4169) @@ -82,7 +82,6 @@ <poi.version>3.0.2-FINAL</poi.version> <richfaces.ui.version>3.2.1.GA</richfaces.ui.version> <report-server.version>1.0.0.Beta1</report-server.version> - <slf4j.version>1.5.5</slf4j.version> <sun.facelets.version>1.1.14</sun.facelets.version> <!-- Database Driver Versions --> @@ -350,16 +349,6 @@ <version>${richfaces.ui.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> <groupId>poi</groupId> <artifactId>poi</artifactId> <version>${poi.version}</version>