[jboss-svn-commits] JBL Code SVN: r32658 - in labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product: lib/ext and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 27 11:38:49 EDT 2010
Author: kevin.conner at jboss.com
Date: 2010-04-27 11:38:45 -0400 (Tue, 27 Apr 2010)
New Revision: 32658
Added:
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/opencsv-1.8.jar
Removed:
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/freemarker-2.3.9.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-commons-1.0.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-edisax-0.3.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-edisax-model-0.3.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-magger-0.1.3.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-core-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-css-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-csv-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-edi-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-misc-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-routing-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-servlet-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-templating-1.0.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-tinak-0.8.1.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/nekohtml-0.9.5.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/ognl-2.6.9.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/opencsv-1.8.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/stringtemplate-2.2.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/xmlbeans-jsr173-api-2.0-dev.jar
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/xpp3_min-1.1.3.4.O.jar
Modified:
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/build-distr.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/build.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/build.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/build.xml
Log:
Merge 4.4.0.GA_CP4_CR3 into SOA branch
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/build-distr.xml 2010-04-27 12:59:45 UTC (rev 32657)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/build-distr.xml 2010-04-27 15:38:45 UTC (rev 32658)
@@ -88,6 +88,8 @@
</fileset>
<!-- We use AOP on scout to get around an issue -->
<fileset dir="${build.dir}" includes="rosetta.aop"/>
+ <!-- We use AOP on smooks to get around an issue -->
+ <fileset dir="${build.dir}" includes="jboss-smooks-1.0.aop"/>
</copy>
<mkdir dir="${build.dir}/jbossesb.sar/juddi-sql"/>
@@ -130,6 +132,11 @@
<fileset dir="${lib.ext.dir}" includes="commons-ssl-*.jar"/>
<!-- groovy -->
<fileset dir="${lib.dir}" includes="groovy-*.jar"/>
+ <!-- smooks -->
+ <fileset dir="${lib.dir}" includes="milyn-*.jar,freemarker-*.jar,ognl-*.jar,stringtemplate-*.jar,xpp3_min-*.jar"
+ excludes="milyn-smooks-core-*.jar"/>
+ <fileset dir="${lib.ext.dir}" includes="opencsv-*.jar"/>
+ <fileset dir="${aoplib.dir}" includes="milyn-*.jar"/>
</copy>
<copy todir="${build.dir}/jbossesb.sar">
<fileset dir="${installation.files.dir}/jUDDI-registry" includes="juddi.war"/>
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml 2010-04-27 12:59:45 UTC (rev 32657)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml 2010-04-27 15:38:45 UTC (rev 32658)
@@ -66,6 +66,19 @@
<dependency org="milyn" name="milyn-smooks-core" rev="1.0.1"/>
<dependency org="milyn" name="milyn-commons" rev="1.0"/>
<dependency org="milyn" name="milyn-smooks-javabean" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-edisax" rev="0.3"/>
+ <dependency org="milyn" name="milyn-edisax-model" rev="0.3"/>
+ <dependency org="milyn" name="milyn-magger" rev="0.1.3"/>
+ <dependency org="milyn" name="milyn-smooks-css" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-smooks-csv" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-smooks-edi" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-smooks-misc" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-smooks-routing" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-smooks-scripting" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-smooks-servlet" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-smooks-templating" rev="1.0.1"/>
+ <dependency org="milyn" name="milyn-tinak" rev="0.8.1"/>
+ <dependency org="org.freemarker" name="freemarker" rev="2.3.9"/>
<dependency org="javax.jcr" name="jcr" rev="1.0"/>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/opencsv-1.8.jar (from rev 32657, labs/jbossesb/tags/JBESB_4_4_GA_CP4_CR3/product/lib/ext/opencsv-1.8.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/build.xml 2010-04-27 12:59:45 UTC (rev 32657)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/build.xml 2010-04-27 15:38:45 UTC (rev 32658)
@@ -2,21 +2,23 @@
<property file="build.properties"/>
+ <property name="esb.product.build.dir" location="../../build"/>
+ <property name="esb.product.aoplib.dir" location="${esb.product.build.dir}/aoplib"/>
<property name="build.dir" location="build"/>
<property name="aop.dir" location="aop"/>
<property name="aop.src.dir" location="${aop.dir}/java"/>
<property name="aop.resources.dir" location="${aop.dir}/resources"/>
- <property name="smooks.jar" value="milyn-smooks-core-1.0.1.jar"/>
+ <property name="smooks.version" value="1.0.1"/>
+ <property name="smooks.jar" value="milyn-smooks-core-${smooks.version}.jar"/>
+ <property name="smooks.aop.jar" value="milyn-smooks-core-${smooks.version}.aop.jar"/>
<property name="aop.jar.version" value="1.0"/>
<property name="aop.jar.name" value="jboss-smooks-${aop.jar.version}.aop"/>
- <property name="aop.jar" value="${build.dir}/${aop.jar.name}"/>
+ <property name="aop.jar" location="${esb.product.build.dir}/${aop.jar.name}"/>
<property name="aop.classes.dir" location="${build.dir}/aop-classes"/>
<property name="aopc.classes.dir" location="${build.dir}/aopc-classes"/>
- <property name="lib.excludes" value="${smooks.jar}"/>
-
<!-- Import the base Ant build script... -->
<import file="${services.base.build}"/>
@@ -46,7 +48,7 @@
<delete dir="${aopc.classes.dir}" quiet="true"/>
<mkdir dir="${aopc.classes.dir}"/>
- <unzip dest="${aopc.classes.dir}" src="lib/ext/${smooks.jar}"/>
+ <unzip dest="${aopc.classes.dir}" src="${esb.main.lib}/${smooks.jar}"/>
<aopc compilerclasspathref="classpath" verbose="true">
<classpath path="${aopc.classes.dir}"/>
@@ -56,11 +58,7 @@
<aoppath path="${aop.resources.dir}/META-INF/jboss-aop.xml"/>
<aopclasspath path="${aop.classes.dir}"/>
</aopc>
- <zip destfile="${build.dir}/${smooks.jar}"
+ <zip destfile="${esb.product.aoplib.dir}/${smooks.aop.jar}"
basedir="${aopc.classes.dir}"/>
</target>
-
- <target name="service-esb" depends="base-esb">
- <copy file="${aop.jar}" todir="${build.dir}/${ant.project.name}.esb"/>
- </target>
</project>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/freemarker-2.3.9.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-commons-1.0.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-edisax-0.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-edisax-model-0.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-magger-0.1.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-core-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-css-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-csv-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-edi-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-misc-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-routing-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-servlet-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-smooks-templating-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/milyn-tinak-0.8.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/nekohtml-0.9.5.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/ognl-2.6.9.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/opencsv-1.8.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/stringtemplate-2.2.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/xmlbeans-jsr173-api-2.0-dev.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/smooks/lib/ext/xpp3_min-1.1.3.4.O.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/build.xml 2010-04-27 12:59:45 UTC (rev 32657)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/build.xml 2010-04-27 15:38:45 UTC (rev 32658)
@@ -11,7 +11,6 @@
<path id="jboss-esb-dependencies">
<fileset dir="../../build/jbossesb/lib" includes="jbossesb-rosetta.jar" />
- <fileset dir="../smooks/lib/ext" includes="*.jar" />
</path>
<path id="build.classpath">
@@ -57,8 +56,6 @@
<copy todir="${sar.dir}">
<fileset dir="src" includes="lib/*.jar"/>
<fileset dir="src/main/resources" />
- <fileset dir="../../build/jbossesb/lib" includes="jbossesb-rosetta.jar" />
- <fileset dir="../smooks/lib/ext" includes="milyn-*.jar" />
</copy>
<copy todir="${sar.dir}">
<!-- fileset dir="${maven.build.directory}" includes="${maven.build.final.name}.jar" / -->
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/build.xml 2010-04-27 12:59:45 UTC (rev 32657)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/build.xml 2010-04-27 15:38:45 UTC (rev 32658)
@@ -25,13 +25,13 @@
<property name="javac.debug" value="true" />
<property name="javac.deprecation" value="false" />
<property name="product.lib.ext.dir" location="../../lib/ext" />
-<property name="product.services.smooks.lib.ext.dir" location="../../services/smooks/lib/ext" />
+<property name="product.build.lib.dir" location="../../build/lib" />
<fileset id="lib" dir="${lib.dir}">
<include name="*.jar" />
</fileset>
-<fileset id="milyn" dir="${product.services.smooks.lib.ext.dir}"
+<fileset id="milyn" dir="${product.build.lib.dir}"
includes="milyn*.jar" />
<fileset id="milyn-dependencies" dir="${product.lib.ext.dir}"
More information about the jboss-svn-commits
mailing list