[jboss-cvs] JBossAS SVN: r90626 - in projects/jboss-jca/trunk: sjc/src/main/java/org/jboss/jca/sjc/deployers/ra and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2009-06-26 06:33:01 -0400 (Fri, 26 Jun 2009)
New Revision: 90626

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.settings.xml
   projects/jboss-jca/trunk/ivy.xml
   projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java
Log:
[JBJCA-68] using meta-common meta-rar instead of jboss-metadata

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2009-06-26 09:28:53 UTC (rev 90625)
+++ projects/jboss-jca/trunk/build.xml	2009-06-26 10:33:01 UTC (rev 90626)
@@ -87,7 +87,11 @@
   <property name="version.jboss.mc.dependency" value="2.2.0.M1"/>
   <property name="version.jboss.mc.kernel" value="2.2.0.M1"/>
   <property name="version.jboss.mdr" value="2.0.1.GA"/>
+<!--
   <property name="version.jboss.metadata" value="1.0.2.Beta1"/>
+-->
+  <property name="version.jboss.metadata.common" value="2.0.0-SNAPSHOT"/>
+  <property name="version.jboss.metadata.rar" value="2.0.0-SNAPSHOT"/>
   <property name="version.jboss.naming" value="5.0.3.GA"/>
   <property name="version.jboss.reflect" value="2.0.2.GA"/>
   <property name="version.jboss.ts" value="4.6.1.GA"/>

Modified: projects/jboss-jca/trunk/ivy.settings.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.settings.xml	2009-06-26 09:28:53 UTC (rev 90625)
+++ projects/jboss-jca/trunk/ivy.settings.xml	2009-06-26 10:33:01 UTC (rev 90626)
@@ -31,8 +31,8 @@
     </filesystem>
     <ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}"
              pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
-    <ibiblio name="snapshots" m2compatible="true" usepoms="false" root="${snapshots.repo}"
-             pattern="[organisation]/[module]/[revision]/[artifact]-[snapshotrevision](-[classifier]).[ext]"/>
+    <ibiblio name="snapshots" m2compatible="true" usepoms="false" root="${snapshots.repo}" useMavenMetadata="true"
+             pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
     <ibiblio name="central" m2compatible="true" usepoms="false" root="${central.repo}"
              pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
     <chain name="default" returnFirst="true">

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2009-06-26 09:28:53 UTC (rev 90625)
+++ projects/jboss-jca/trunk/ivy.xml	2009-06-26 10:33:01 UTC (rev 90626)
@@ -82,7 +82,12 @@
     <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="standalone->default;sjc->*"/>
     <dependency org="org.jboss.man" name="jboss-managed" rev="${version.jboss.managed}" conf="standalone->default"/>
     <dependency org="org.jboss.man" name="jboss-metatype" rev="${version.jboss.managed}" conf="standalone->default"/>
+<!--
     <dependency org="org.jboss.metadata" name="jboss-metadata" rev="${version.jboss.metadata}" conf="standalone->default;sjc->*"/>
+-->
+    <dependency org="org.jboss.metadata" name="metadata-common" rev="${version.jboss.metadata.common}" conf="standalone->default;sjc->*"/>
+    <dependency org="org.jboss.metadata" name="metadata-rar" rev="${version.jboss.metadata.rar}" conf="standalone->default;sjc->*"/>
+
     <dependency org="org.jboss.microcontainer" name="jboss-aop-mc-int" rev="${version.jboss.mc.aop-int}" conf="standalone->default"/>
     <dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="${version.jboss.mc.dependency}" conf="standalone->default"/>
     <dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="${version.jboss.mc.kernel}" conf="standalone->default"/>

Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java	2009-06-26 09:28:53 UTC (rev 90625)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java	2009-06-26 10:33:01 UTC (rev 90626)
@@ -118,7 +118,10 @@
             log.debug("Total parse for " + url + " took " + (System.currentTimeMillis() - start) + "ms");
 
             if (trace)
-               log.trace(result);
+            {
+               log.trace("successful parse " + result.getVersion() + " rar package " + result);
+            }
+               
          }
          catch (Exception e)
          {