[jboss-svn-commits] JBL Code SVN: r27287 - in labs/jbossesb/trunk/product: lib/ext and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jun 29 09:29:38 EDT 2009


Author: kevin.conner at jboss.com
Date: 2009-06-29 09:29:37 -0400 (Mon, 29 Jun 2009)
New Revision: 27287

Added:
   labs/jbossesb/trunk/product/lib/ext/opencsv-1.8.jar
Removed:
   labs/jbossesb/trunk/product/services/smooks/lib/ext/freemarker-2.3.9.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/jackson-lgpl-0.9.3.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/jline-0.9.93.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-commons-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-edisax-parser-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-magger-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-core-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-css-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-csv-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-edi-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-javabean-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-json-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-misc-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-routing-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-scripting-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-servlet-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-templating-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-tinak-1.1.1.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/nekohtml-0.9.5.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/ognl-2.6.9.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/opencsv-1.8.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/stringtemplate-2.2.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/xmlbeans-jsr173-api-2.0-dev.jar
   labs/jbossesb/trunk/product/services/smooks/lib/ext/xpp3_min-1.1.3.4.O.jar
Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/services/soapui-client/build.xml
   labs/jbossesb/trunk/product/tools/console/build.xml
Log:
move smooks jars to jbossesb.sar: JBESB-2632

Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2009-06-29 13:09:30 UTC (rev 27286)
+++ labs/jbossesb/trunk/product/build-distr.xml	2009-06-29 13:29:37 UTC (rev 27287)
@@ -150,6 +150,9 @@
             <fileset dir="${lib.dir}" includes="mina-*.jar"/>
             <fileset dir="${lib.dir}" includes="slf4j-*.jar"/>
             <fileset dir="${lib.dir}" includes="xmlunit-*.jar"/>
+            <!-- smooks -->
+            <fileset dir="${lib.dir}" includes="milyn-*.jar,freemarker-*.jar,jackson-lgpl-*.jar,ognl-*.jar,stringtemplate-*.jar,xpp3_min-*.jar"/>
+            <fileset dir="${lib.ext.dir}" includes="opencsv-*.jar"/>
         </copy>
     	<copy todir="${build.dir}/jbossesb.sar">
     		<fileset dir="${installation.files.dir}/jUDDI-registry" includes="juddi.war"/>

Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2009-06-29 13:09:30 UTC (rev 27286)
+++ labs/jbossesb/trunk/product/ivy.xml	2009-06-29 13:29:37 UTC (rev 27287)
@@ -71,6 +71,20 @@
         <dependency org="org.milyn" name="milyn-commons" rev="1.1.1"/>
         <dependency org="org.milyn" name="milyn-smooks-core" rev="1.1.1"/>
         <dependency org="org.milyn" name="milyn-smooks-javabean" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-edisax-parser" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-magger" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-css" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-csv" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-edi" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-json" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-misc" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-routing" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-scripting" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-servlet" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-templating" rev="1.1.1"/>
+        <dependency org="org.milyn" name="milyn-tinak" rev="1.1.1"/>
+        <dependency org="org.freemarker" name="freemarker" rev="2.3.9"/>
+        <dependency org="jackson" name="jackson-lgpl" rev="0.9.3"/>
 
         <dependency org="javax.jcr" name="jcr" rev="1.0"/>
 

Copied: labs/jbossesb/trunk/product/lib/ext/opencsv-1.8.jar (from rev 27152, labs/jbossesb/trunk/product/services/smooks/lib/ext/opencsv-1.8.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/freemarker-2.3.9.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/jackson-lgpl-0.9.3.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/jline-0.9.93.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-commons-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-edisax-parser-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-magger-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-core-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-css-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-csv-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-edi-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-javabean-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-json-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-misc-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-routing-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-scripting-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-servlet-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-templating-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-tinak-1.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/nekohtml-0.9.5.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/ognl-2.6.9.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/opencsv-1.8.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/stringtemplate-2.2.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/xmlbeans-jsr173-api-2.0-dev.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/services/smooks/lib/ext/xpp3_min-1.1.3.4.O.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/services/soapui-client/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/build.xml	2009-06-29 13:09:30 UTC (rev 27286)
+++ labs/jbossesb/trunk/product/services/soapui-client/build.xml	2009-06-29 13:29:37 UTC (rev 27287)
@@ -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">
@@ -58,8 +57,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/trunk/product/tools/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/build.xml	2009-06-29 13:09:30 UTC (rev 27286)
+++ labs/jbossesb/trunk/product/tools/console/build.xml	2009-06-29 13:29:37 UTC (rev 27287)
@@ -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