[jboss-svn-commits] JBL Code SVN: r37237 - in labs/jbossesb/trunk/product: lib/ext and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 5 15:48:45 EDT 2011
Author: tcunning
Date: 2011-07-05 15:48:45 -0400 (Tue, 05 Jul 2011)
New Revision: 37237
Added:
labs/jbossesb/trunk/product/lib/ext/ejb3-persistence-1.0.2.GA.jar
Modified:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/ivy.xml
labs/jbossesb/trunk/product/ivysettings.xml
labs/jbossesb/trunk/product/services/base-project-build.xml
labs/jbossesb/trunk/product/tools/jonplugin/build.xml
Log:
JBESB-3624
Change the deprecated JBoss repository URLs to nexus ones. Check in
ejb3-persistence JAR into lib/ext due to resolution errors associated with
that JAR.
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2011-07-05 12:43:35 UTC (rev 37236)
+++ labs/jbossesb/trunk/product/build-distr.xml 2011-07-05 19:48:45 UTC (rev 37237)
@@ -84,6 +84,9 @@
<fileset dir="${installation.files.dir}/jUDDI-registryV3">
<include name="esb.juddi.client.xml"/>
</fileset>
+ <fileset dir="${services.dir}/jbrules/build">
+ <include name="drools-core-5.2.0.Final.aop"/>
+ </fileset>
</copy>
<mkdir dir="${build.dir}/jbossesb.sar/lib"/>
@@ -93,7 +96,7 @@
<fileset dir="${lib.dir}" includes="xbean*.jar"/>
<fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
<!-- jUDDI Registry, we're one -->
- <fileset dir="${lib.ext.dir}" includes="scout-*.jar"/>
+ <fileset dir="${lib.dir}" includes="scout-*.jar"/>
<fileset dir="${lib.dir}" includes="juddi-client-*.jar, uddi-ws-*.jar"/>
<fileset dir="${lib.dir}" includes="commons-configuration-*.jar,commons-codec-*.jar"/>
<!-- camel -->
Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml 2011-07-05 12:43:35 UTC (rev 37236)
+++ labs/jbossesb/trunk/product/ivy.xml 2011-07-05 19:48:45 UTC (rev 37237)
@@ -25,7 +25,9 @@
</dependency>
<dependency org="com.h2database" name="h2" rev="1.2.124"/>
<dependency org="hibernate" name="hibernate3" rev="3.2.4.SP1"/>
+ <!--
<dependency org="org.hibernate" name="ejb3-persistence" rev="1.0.2.GA"/>
+ -->
<dependency org="hibernate-entitymanager" name="hibernate-entitymanager" rev="3.2.1.GA"/>
<dependency org="jboss" name="jboss-cache" rev="1.2.4.SP2"/>
<dependency org="jgroups" name="jgroups" rev="2.4.1"/>
@@ -33,9 +35,7 @@
<dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
<dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0"/>
-<!--
- <dependency org="org.apache.ws.scout" name="scout" rev="1.2.2"/>
--->
+ <dependency org="org.apache.ws.scout" name="scout" rev="1.2.3"/>
<dependency org="org.apache.camel" name="camel-core" rev="2.4.0"/>
<dependency org="org.fusesource.commonman" name="commons-management" rev="1.0"/>
Modified: labs/jbossesb/trunk/product/ivysettings.xml
===================================================================
--- labs/jbossesb/trunk/product/ivysettings.xml 2011-07-05 12:43:35 UTC (rev 37236)
+++ labs/jbossesb/trunk/product/ivysettings.xml 2011-07-05 19:48:45 UTC (rev 37237)
@@ -5,12 +5,12 @@
<settings defaultResolver="chained"/>
<resolvers>
<chain name="chained">
- <url name="jboss" m2compatible="true">
- <artifact pattern="http://repository.jboss.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
- </url>
<url name="jboss-nexus" m2compatible="true">
<artifact pattern="https://repository.jboss.org/nexus/content/groups/public/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
+ <url name="jboss-deprecated" m2compatible="true">
+ <artifact pattern="https://repository.jboss.org/nexus/content/repositories/deprecated/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+ </url>
<ibiblio name="ibiblio" m2compatible="true"/>
<url name="milyn" m2compatible="true">
<artifact pattern="http://dist.codehaus.org/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
@@ -20,7 +20,7 @@
<artifact pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
<url name="ejb3">
- <artifact pattern="http://repository.jboss.org/maven2/org/hibernate/[artifact]/[revision]/[artifact]-[revision].jar"/>
+ <artifact pattern="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
</url>
<url name="entitymanager">
<artifact pattern="http://repository.jboss.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].jar"/>
@@ -40,11 +40,11 @@
</resolvers>
<modules>
<module organisation="org.milyn" name="*" resolver="smooks"/>
- <module organisation="org.hibernate" name="ejb3-persistence" resolver="ejb3"/>
+ <module organisation="org/hibernate" name="ejb3-persistence" resolver="ejb3"/>
<module organisation="org.apache.juddi" name="*" resolver="juddi"/>
<module organisation="org.apache.ws.scout" name="*" resolver="scout"/>
<module organisation="org.apache.camel" name="*" resolver="camel"/>
<module organisation="org.fusesource.commonman" name="*" resolver="commonman"/>
- <module organisation="hibernate-entitymanager" name="hibernate-entitymanager" resolver="entitymanager"/>
+ <module organisation="hibernate-entitymanager" name="hibernate-entitymanager" resolver="jboss-deprecated"/>
</modules>
</ivysettings>
Added: labs/jbossesb/trunk/product/lib/ext/ejb3-persistence-1.0.2.GA.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ext/ejb3-persistence-1.0.2.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/base-project-build.xml 2011-07-05 12:43:35 UTC (rev 37236)
+++ labs/jbossesb/trunk/product/services/base-project-build.xml 2011-07-05 19:48:45 UTC (rev 37237)
@@ -85,7 +85,7 @@
<fileset dir="${esb.main.lib}" includes="ognl*.jar"/>
<fileset dir="${esb.main.lib}" includes="picketlink*.jar"/>
<fileset dir="${esb.main.lib}" includes="quartz*.jar"/>
- <fileset dir="${esb.root.dir}/lib/ext" includes="scout*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="scout*.jar"/>
<fileset dir="${esb.main.lib}" includes="stax-api*.jar"/>
<fileset dir="${esb.main.lib}" includes="uddi-ws*.jar"/>
<fileset dir="${esb.main.lib}" includes="xbean*.jar"/>
Modified: labs/jbossesb/trunk/product/tools/jonplugin/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/build.xml 2011-07-05 12:43:35 UTC (rev 37236)
+++ labs/jbossesb/trunk/product/tools/jonplugin/build.xml 2011-07-05 19:48:45 UTC (rev 37237)
@@ -4,6 +4,7 @@
<property name="product.build.dir" location="${product.dir}/build"/>
<property name="product.lib.dir" location="${product.build.dir}/lib"/>
<property name="jbossesb.lib.dir" location="${product.build.dir}/jbossesb/lib"/>
+ <property name="product.lib.ext.dir" location="${product.dir}/lib/ext"/>
<property name="build.dir" location="build"/>
<property name="extract.dir" location="${build.dir}/extract"/>
@@ -132,7 +133,8 @@
<src path="${java.as4.dir}"/>
<classpath>
<path refid="as4.classpath"/>
- <fileset dir="${product.lib.dir}" includes="commons-logging*.jar ejb3-persistence*.jar jaxb-api-*.jar jbossall-client*.jar"/>
+ <fileset dir="${product.lib.ext.dir}" includes="ejb3-persistence*.jar"/>
+ <fileset dir="${product.lib.dir}" includes="commons-logging*.jar jaxb-api-*.jar jbossall-client*.jar"/>
</classpath>
</javac>
</target>
@@ -144,7 +146,8 @@
<classpath>
<path refid="as5.classpath"/>
<fileset dir="${product.lib.dir}" includes="jboss-metatype-8.jar jboss-managed-*.jar jboss-profileservice-spi-*.jar"/>
- <fileset dir="${product.lib.dir}" includes="commons-logging*.jar commons-lang-*.jar ejb3-persistence*.jar jaxb-api-*.jar jbossall-client*.jar"/>
+ <fileset dir="${product.lib.ext.dir}" includes="ejb3-persistence*.jar"/>
+ <fileset dir="${product.lib.dir}" includes="commons-logging*.jar commons-lang-*.jar jaxb-api-*.jar jbossall-client*.jar"/>
</classpath>
</javac>
</target>
More information about the jboss-svn-commits
mailing list