[jboss-svn-commits] JBL Code SVN: r21323 - in labs/jbossesb/trunk: product/etc/schemas/validation and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 1 14:34:01 EDT 2008
Author: tfennelly
Date: 2008-08-01 14:34:01 -0400 (Fri, 01 Aug 2008)
New Revision: 21323
Removed:
labs/jbossesb/trunk/product/lib/ext/quartz-1.5.2.jar
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/esb-config.xml
labs/jbossesb/trunk/product/etc/schemas/validation/build.xml
labs/jbossesb/trunk/product/ftp/build.xml
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/ivy-build.xml
labs/jbossesb/trunk/product/ivy.xml
labs/jbossesb/trunk/product/rosetta/build.xml
labs/jbossesb/trunk/product/rosetta/tests/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
labs/jbossesb/trunk/product/samples/trailblazer/build.xml
labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml
labs/jbossesb/trunk/product/services/soap/base-project-build.xml
labs/jbossesb/trunk/product/services/soap/build.xml
labs/jbossesb/trunk/product/services/soapui-client/build.xml
labs/jbossesb/trunk/product/tools/console/management-web/build.xml
labs/jbossesb/trunk/product/tools/console/management/build.xml
labs/jbossesb/trunk/qa/quickstarts/build.xml
Log:
More https://jira.jboss.org/jira/browse/JBESB-1763
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -493,7 +493,8 @@
</target>
<target name="integration" description="run integration tests">
- <antcall target="start-server"/>
+ <antcall target="dependencies.get" />
+ <antcall target="start-server"/>
<runant target="org.jboss.esb.integration.test"
failonerror="false" resultproperty="integration.product.resultproperty"/>
<antcall target="stop-server"/>
Modified: labs/jbossesb/trunk/product/esb-config.xml
===================================================================
--- labs/jbossesb/trunk/product/esb-config.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/esb-config.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -181,7 +181,7 @@
<copy todir="${esb.deploy-dir}/${esb.ftp.server.name}/res/conf"
file="${esb.config.location}/ftpd.properties" overwrite="true"/>
</target>
-
+
<target name="esb.init" depends="esb.init-app-server, esb.init-esb-server, esb.init-ftp-server"
description="target for initialising properties">
<path id="server.classpath">
Modified: labs/jbossesb/trunk/product/etc/schemas/validation/build.xml
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/validation/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/etc/schemas/validation/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -17,7 +17,7 @@
<!-- P A T H S -->
<!-- ================================================================== -->
<path id="build.classpath">
- <fileset dir="../../../lib">
+ <fileset dir="../../../build/lib">
<include name="**/**/*.jar"/>
</fileset>
</path>
Modified: labs/jbossesb/trunk/product/ftp/build.xml
===================================================================
--- labs/jbossesb/trunk/product/ftp/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/ftp/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -16,7 +16,7 @@
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
- <fileset dir="../lib">
+ <fileset dir="../build/lib">
<include name="*.jar"/>
</fileset>
<fileset dir="../lib/ext">
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/install/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -35,7 +35,7 @@
<target name="dependencies.jbossesb" if="hierarchy.jbossesb">
<property name="org.jboss.esb.dist" location="${product.dir}"/>
- <property name="org.jboss.esb.dist.lib" location="${org.jboss.esb.dist}/lib"/>
+ <property name="org.jboss.esb.dist.lib" location="${org.jboss.esb.dist}/build/lib"/>
</target>
<target name="dependencies.source" if="hierarchy.source">
Modified: labs/jbossesb/trunk/product/ivy-build.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy-build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/ivy-build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -1,10 +1,6 @@
<project name="Dependencies" default="retrieve" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
- <!-- Need to define this property because we need to be able
- to override it when calling from external targets... -->
- <property name="antlib.dir" value="../antlib" />
-
- <property name="ivy.lib.dir" value="${basedir}/lib" />
+ <property name="ivy.lib.dir" value="${basedir}/build/lib" />
<path id="classpath.ivy">
<fileset dir="${basedir}/../antlib" includes="ivy-*.jar" />
</path>
Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/ivy.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -47,7 +47,10 @@
<dependency org="org.mvel" name="mvel" rev="1.3.1-java1.4"/>
<dependency org="ognl" name="ognl" rev="2.6.9"/>
- <!-- dependency org="quartz" name="quartz" rev="1.5.2"/ -->
+ <dependency org="quartz" name="quartz" rev="1.5.2">
+ <exclude org="javax.transaction" module="jta"/>
+ <exclude org="javax.ejb" module="ejb"/>
+ </dependency>
<dependency org="org.antlr" name="stringtemplate" rev="3.0"/>
<!-- dependency org="trove" name="trove" rev="2.1.1"/ -->
Deleted: labs/jbossesb/trunk/product/lib/ext/quartz-1.5.2.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/rosetta/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -9,7 +9,7 @@
<property name="gendir" location="${org.jboss.esb.internal.dest}/schema-model" />
<property environment="env"/>
- <property name="org.jboss.esb.lib.dir" location="${org.jboss.esb.root.dir}/lib"/>
+ <property name="org.jboss.esb.lib.dir" location="${org.jboss.esb.root.dir}/build/lib"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
<path id="org.jboss.esb.rosetta.base.classpath">
Modified: labs/jbossesb/trunk/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/rosetta/tests/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -11,7 +11,7 @@
<property name="org.jboss.esb.module.tests.coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage/rosetta"/>
<property name="org.jboss.esb.module.classes.instr.dir" location="${org.jboss.esb.module.tests.coverage.dir}/instr" />
<property environment="env"/>
- <property name="org.jboss.esb.lib.dir" location="${org.jboss.esb.root.dir}/lib"/>
+ <property name="org.jboss.esb.lib.dir" location="${org.jboss.esb.root.dir}/build/lib"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="../../install/deployment.properties"/>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -15,7 +15,7 @@
<target name="quickstart-specific-checks">
<property name="driver" value="org.h2.Driver"/>
- <property name="driver.jar" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/h2.jar"/>
+ <property name="driver.jar" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/h2-1.0.68.jar"/>
<property name="url" value="jdbc:h2:tcp://localhost:9095/"/>
</target>
Modified: labs/jbossesb/trunk/product/samples/trailblazer/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/samples/trailblazer/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -27,7 +27,7 @@
<property environment="env" />
<property name="esb.lib.file" value="jbossesb-rosetta.jar"/>
- <property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/../../lib"/>
+ <property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/../../build/lib"/>
<property name="soa.esb.lib.src.dir" value="../../build/jbossesb/lib"/>
<property name="esb.default.dir" value="../../server/default"/>
<property name="esb.sar.lib.dir" value="${esb.default.dir}/deploy/jbossesb.sar/lib"/>
@@ -87,7 +87,7 @@
<fileset dir="${soa.esb.lib.dir}"
includes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
<fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/>
- <fileset dir="${esb.home.dir}/lib/ext" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
+ <fileset dir="${esb.home.dir}/build/lib" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
<fileset dir="${soa.esb.lib.dir}" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
<fileset dir="${log4j.lib.dir}" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
Modified: labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -3,7 +3,7 @@
<path id="classpath">
<pathelement location="src/test/resources"/>
- <fileset dir="${basedir}/../../../lib" includes="commons-codec-*.jar,commons-httpclient-*.jar" />
+ <fileset dir="${basedir}/../../../build/lib" includes="commons-codec-*.jar,commons-httpclient-*.jar" />
<pathelement location="${basedir}/../../../../testlib/junit-4.1.jar" />
<pathelement location="${ant.library.dir}/ant.jar" />
</path>
Modified: labs/jbossesb/trunk/product/services/soap/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/base-project-build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/services/soap/base-project-build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -36,7 +36,7 @@
<fileset dir="${esb.product.lib.dir}" includes="*.jar"/>
<!-- Product Jars. -->
<pathelement location="src/test/resources"/>
- <fileset dir="../../lib" includes="*.jar"/>
+ <fileset dir="../../build/lib" includes="*.jar"/>
</path>
<path id="test.classpath">
Modified: labs/jbossesb/trunk/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/services/soap/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -9,7 +9,7 @@
<path refid="base-classpath" />
<fileset dir="../../lib/ext" includes="*.jar"/>
- <fileset dir="../../lib" includes="*.jar"/>
+ <fileset dir="../../build/lib" includes="*.jar"/>
<!-- Adding the Smooks jars... -->
<fileset dir="../smooks/lib/ext" includes="*.jar"/>
Modified: labs/jbossesb/trunk/product/services/soapui-client/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/services/soapui-client/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -18,7 +18,7 @@
<path location="${basedir}/src/test/resources"/>
<fileset dir="src/lib" includes="*.jar" />
<fileset dir="../../lib/ext" includes="*.jar" />
- <fileset dir="../../lib" includes="*.jar" />
+ <fileset dir="../../build/lib" includes="*.jar" />
<fileset dir="../../../testlib" includes="*.jar"/>
<path refid="jboss-esb-dependencies" />
</path>
Modified: labs/jbossesb/trunk/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/tools/console/management/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -4,7 +4,7 @@
<property name="console.dir" value="${esb.root.dir}/tools/console"/>
<property file="${esb.root.dir}/tools/console/management-esb/db.properties"/>
<property name="mgmt.dir" location="."/>
- <property name="lib.dir" location="${mgmt.dir}/../../../lib"/>
+ <property name="lib.dir" location="${mgmt.dir}/../../../build/lib"/>
<property name="mgmt.build.dir" location="${mgmt.dir}/build"/>
<property name="src.java.dir" location="${mgmt.dir}/src/main/java"/>
Modified: labs/jbossesb/trunk/product/tools/console/management-web/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-web/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/product/tools/console/management-web/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -48,6 +48,7 @@
<fileset dir="${mgmt.web.dir}/lib" includes="*.jar"/>
<path location="${product.dir}/services/jbpm/lib/ext/dom4j.jar"/>
<fileset dir="${product.dir}/lib/ext" includes="*.jar"/>
+ <fileset dir="${product.dir}/build/lib" includes="*.jar"/>
</path>
<target name="hibtool" depends="build-jar">
Modified: labs/jbossesb/trunk/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
+++ labs/jbossesb/trunk/qa/quickstarts/build.xml 2008-08-01 18:34:01 UTC (rev 21323)
@@ -24,7 +24,7 @@
<property name="org.jboss.soa.esb.paramsRepository.file.root" location="src"/>
- <property name="junit.jar" location="${product.dir}/lib/ext/junit-4.1.jar"/>
+ <property name="junit.jar" location="${product.dir}/../testlib/junit-4.1.jar"/>
<import file="../base-cp.xml"/>
More information about the jboss-svn-commits
mailing list