[jboss-cvs] JBossAS SVN: r90253 - in branches/EMBEDDED_JBOSS_BETA3_COMMUNITY: ejb3 and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jun 16 10:39:12 EDT 2009


Author: manaRH
Date: 2009-06-16 10:39:12 -0400 (Tue, 16 Jun 2009)
New Revision: 90253

Modified:
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/build/build-thirdparty.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/build.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/docs/tutorial/http_https/ejb3.deployer/META-INF/jboss-service.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/jbossbuild.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/jboss-service.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/build.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/hibernate-int/.classpath
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/jbossbuild.xml
   branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/secondary-dependency-test.xml
Log:
upgraded HCore, HAN, HEM, HValidator, jboss-metadata

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/build/build-thirdparty.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/build/build-thirdparty.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/build/build-thirdparty.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -74,11 +74,11 @@
     <componentref name="easymock" version="1.1"/>
     <componentref name="gjt-jpl-util" version="1.0"/>
     <componentref name="gnu-getopt" version="1.0.12-brew"/>
-    <componentref name="hibernate" version="3.2.4.SP1_CP01-brew"/>
-    <componentref name="hibernate-annotations" version="3.3.1.Beta1"/>
-    <componentref name="hibernate-commons-annotations" version="3.0.0.GA"/>
-    <componentref name="hibernate-entitymanager" version="3.3.2.Beta1"/>
-    <componentref name="hibernate-validator" version="3.0.0.GA"/>
+    <componentref name="hibernate" version="3.3.1.GA"/>
+    <componentref name="hibernate-annotations" version="3.4.0.GA"/>
+    <componentref name="hibernate-commons-annotations" version="3.1.0.GA"/>
+    <componentref name="hibernate-entitymanager" version="3.4.0.GA"/>
+    <componentref name="hibernate-validator" version="3.1.0.GA"/>
     <componentref name="hsqldb" version="1.8.0.8-brew"/>
     <componentref name="jacorb" version="2.3.0jboss.patch5-brew"/>
     <componentref name="javassist" version="3.6.0.GA"/>
@@ -106,7 +106,7 @@
     <componentref name="jboss/jbossxb" version="2.0.0.CR5"/>
     <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
     <componentref name="jboss/messaging" version="1.4.0.SP1-brew"/>
-    <componentref name="jboss/metadata" version="1.0.0.Beta4"/>
+    <componentref name="jboss/metadata" version="1.0.0.CR15"/>
     <componentref name="jboss/microcontainer" version="2.0.0.Beta9"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
     <componentref name="jboss/remoting" version="2.2.2.SP3-brew"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/build.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/build.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -306,7 +306,7 @@
       <!-- <unjar src="${hibernate.hibernate.lib}/hibernate3.jar"
          dest="${build.classes}" />  -->
       <jar jarfile="${build.lib}/hibernate-client.jar">
-         <zipfileset src="${hibernate.hibernate.lib}/hibernate3.jar">
+         <zipfileset src="${hibernate.hibernate.lib}/hibernate-core.jar">
             <include name="org/hibernate/AssertionFailure.class"/>
             <include name="org/hibernate/**/*Exception.class"/>
             <include name="org/hibernate/collection/**"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/docs/tutorial/http_https/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/docs/tutorial/http_https/ejb3.deployer/META-INF/jboss-service.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/docs/tutorial/http_https/ejb3.deployer/META-INF/jboss-service.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -55,7 +55,7 @@
          commons-httpclient.jar,
          commons-logging.jar,
          commons-vfs.jar,
-         hibernate3.jar,
+         hibernate-core.jar,
          commons-logging-api.jar,
          asm.jar,
          asm-attrs.jar,

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/jbossbuild.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/jbossbuild.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/jbossbuild.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -144,7 +144,7 @@
          <include input="ejb3-persistence.jar" />
          <include input="hibernate-annotations.jar" />
          <include input="hibernate-entitymanager.jar" />
-         <include input="hibernate3.jar" />         
+         <include input="hibernate-core.jar" />         
 	 <include input="jaxen-1.1-beta-4.jar" />                                    
 	 <include input="jboss-annotations-ejb3.jar" /> 
 	 <include input="jboss-ejb3x.jar" />
@@ -192,7 +192,7 @@
          <include input="ejb3-persistence.jar" prefix="lib"/>
          <include input="hibernate-annotations.jar" prefix="lib"/>
          <include input="hibernate-entitymanager.jar" prefix="lib"/>
-         <include input="hibernate3.jar" prefix="lib"/>         
+         <include input="hibernate-core.jar" prefix="lib"/>         
          <include input="hsqldb.jar" prefix="lib"/>                  
 	 <include input="jaxen-1.1-beta-4.jar" prefix="lib"/>                           
 	 <include input="jboss-annotations-ejb3.jar" prefix="lib"/>                           

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -70,7 +70,7 @@
             <value>commons-httpclient.jar</value>
             <value>commons-logging.jar</value>
             <value>commons-vfs.jar</value>
-            <value>hibernate3.jar</value>
+            <value>hibernate-core.jar</value>
             <value>commons-logging-api.jar</value>
             <value>asm.jar</value>
             <value>asm-attrs.jar</value>

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/jboss-service.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/jboss-service.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/META-INF/jboss-service.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -77,7 +77,7 @@
          commons-httpclient.jar,
          commons-logging.jar,
          commons-vfs.jar,
-         hibernate3.jar,
+         hibernate-core.jar,
          commons-logging-api.jar,
          asm.jar,
          asm-attrs.jar,

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -55,7 +55,7 @@
          commons-httpclient.jar,
          commons-logging.jar,
          commons-vfs.jar,
-         hibernate3.jar,
+         hibernate-core.jar,
          commons-logging-api.jar,
          asm.jar,
          asm-attrs.jar,

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -70,7 +70,7 @@
             <value>commons-httpclient.jar</value>
             <value>commons-logging.jar</value>
             <value>commons-vfs.jar</value>
-            <value>hibernate3.jar</value>
+            <value>hibernate-core.jar</value>
             <value>commons-logging-api.jar</value>
             <value>asm.jar</value>
             <value>asm-attrs.jar</value>

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/build.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/build.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -349,7 +349,7 @@
    	     </fileset>
    	  </jar>
 
-      <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-all.jar">
+      <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-all.jar" duplicate="preserve">
          <fileset dir="${build.classes}">
             <exclude name="org/jboss/embedded/**"/>
          </fileset>
@@ -439,7 +439,7 @@
 
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/hibernate-all.jar">
-         <zipfileset src="${hibernate.lib}/hibernate3.jar"/>
+         <zipfileset src="${hibernate.lib}/hibernate-core.jar"/>
          <zipfileset src="${hibernate.entitymanager.lib}/ejb3-persistence.jar"/>
          <zipfileset src="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar"/>
          <zipfileset src="${hibernate.annotations.lib}/hibernate-annotations.jar"/>
@@ -489,7 +489,7 @@
             <include name="**"/>
          </fileset>
       </javadoc>
-      <property name="embedded.version" value="embedded-jboss-beta3"/>
+      <property name="embedded.version" value="embedded-jboss-beta3.SP7"/>
       <zip zipfile="${embedded.version}.zip">
          <zipfileset dir="." prefix="${embedded.version}">
             <include name="DOCUMENTATION.html"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -70,7 +70,7 @@
             <value>commons-httpclient.jar</value>
             <value>commons-logging.jar</value>
             <value>commons-vfs.jar</value>
-            <value>hibernate3.jar</value>
+            <value>hibernate-core.jar</value>
             <value>commons-logging-api.jar</value>
             <value>asm.jar</value>
             <value>asm-attrs.jar</value>

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/hibernate-int/.classpath
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/hibernate-int/.classpath	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/hibernate-int/.classpath	2009-06-16 14:39:12 UTC (rev 90253)
@@ -10,7 +10,6 @@
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
 	<classpathentry kind="src" path="/j2se"/>
-	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jbosscache.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system"/>
@@ -18,5 +17,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/integration/lib/jboss-integration.jar" sourcepath="/thirdparty/jboss/integration/lib/integration-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/jbossbuild.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/jbossbuild.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/jbossbuild.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -889,7 +889,7 @@
       <!-- hibernate                                                    -->
       <!-- ============================================================ -->        
       <component name="hibernate" version="3.1rc1" > 
-         <artifact id="hibernate3.jar" release="server/all/lib, server/default/lib"/>       
+         <artifact id="hibernate-core.jar" release="server/all/lib, server/default/lib"/>       
       </component>
       
       <!-- ============================================================ -->

Modified: branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/secondary-dependency-test.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/secondary-dependency-test.xml	2009-06-16 14:37:10 UTC (rev 90252)
+++ branches/EMBEDDED_JBOSS_BETA3_COMMUNITY/jbossas/secondary-dependency-test.xml	2009-06-16 14:39:12 UTC (rev 90253)
@@ -43,7 +43,7 @@
      <condition>
       <and>
        <not>
-          <available file="../thirdparty/hibernate/3.0.5/lib/hibernate3.jar" />
+          <available file="../thirdparty/hibernate/3.4.0.GA/lib/hibernate-core.jar" />
        </not>
        <not>
           <available file="../thirdparty/hibernate/3.0.5/lib/hibernate-annotations.jar" />




More information about the jboss-cvs-commits mailing list