geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r799921 - in /geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it: j2ee-system-2/src/test/resources/META-INF/ j2ee-system/ j2ee-system/src/test/resources/META-INF/
Date Sat, 01 Aug 2009 20:39:43 GMT
Author: djencks
Date: Sat Aug  1 20:39:43 2009
New Revision: 799921

URL: http://svn.apache.org/viewvc?rev=799921&view=rev
Log:
make its work with  new jaxb spec

Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=799921&r1=799920&r2=799921&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
Sat Aug  1 20:39:43 2009
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
+                 xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <name>Geronimo Configs :: J2EE System</name>
     <category>Geronimo Core</category>
     <description>Apache Geronimo, the JavaEE server project of the Apache Software
Foundation.</description>
@@ -75,8 +76,8 @@
             <type>jar</type>
         </dependency>
         <dependency start="true">
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
             <type>jar</type>
         </dependency>
         <dependency start="true">

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml?rev=799921&r1=799920&r2=799921&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
Sat Aug  1 20:39:43 2009
@@ -74,11 +74,11 @@
         <artifactId>ognl</artifactId>
         <type>jar</type>
       </dependency>
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <type>jar</type>
-      </dependency>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+          <type>jar</type>
+        </dependency>
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=799921&r1=799920&r2=799921&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
Sat Aug  1 20:39:43 2009
@@ -207,97 +207,97 @@
                     <osiApproved>true</osiApproved>
                     <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
                     <dependencies>
-                        <dependency>
-                            <groupId>com.sun.xml.bind</groupId>
-                            <artifactId>jaxb-impl</artifactId>
-                            <version>2.1.7</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                            <version>1.0.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-common</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>jline</groupId>
-                            <artifactId>jline</artifactId>
-                            <version>0.9.94</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-crypto</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                            <version>3.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-jexl</groupId>
-                            <artifactId>commons-jexl</artifactId>
-                            <version>1.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
-                            <version>3.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                            <version>1.0</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.codehaus.woodstox</groupId>
-                            <artifactId>wstx-asl</artifactId>
-                            <version>3.2.7</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-                            <version>1.0-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-activation_1.1_spec</artifactId>
-                            <version>1.0.2</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-system</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
+                        <!--<dependency>-->
+                            <!--<groupId>com.sun.xml.bind</groupId>-->
+                            <!--<artifactId>jaxb-impl</artifactId>-->
+                            <!--<version>2.1.7</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+                            <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>-->
+                            <!--<version>1.0.1</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-common</artifactId>-->
+                            <!--<version>2.2-SNAPSHOT</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>jline</groupId>-->
+                            <!--<artifactId>jline</artifactId>-->
+                            <!--<version>0.9.94</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-crypto</artifactId>-->
+                            <!--<version>2.2-SNAPSHOT</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>asm</groupId>-->
+                            <!--<artifactId>asm</artifactId>-->
+                            <!--<version>3.1</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>commons-jexl</groupId>-->
+                            <!--<artifactId>commons-jexl</artifactId>-->
+                            <!--<version>1.1</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>asm</groupId>-->
+                            <!--<artifactId>asm-commons</artifactId>-->
+                            <!--<version>3.1</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>commons-cli</groupId>-->
+                            <!--<artifactId>commons-cli</artifactId>-->
+                            <!--<version>1.0</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.codehaus.woodstox</groupId>-->
+                            <!--<artifactId>wstx-asl</artifactId>-->
+                            <!--<version>3.2.7</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+                            <!--<artifactId>geronimo-jaxb_2.1_spec</artifactId>-->
+                            <!--<version>1.0-SNAPSHOT</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+                            <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
+                            <!--<version>1.0.2</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-system</artifactId>-->
+                            <!--<version>2.2-SNAPSHOT</version>-->
+                            <!--<type>jar</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
                     </dependencies>
 
                 </configuration>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=799921&r1=799920&r2=799921&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
Sat Aug  1 20:39:43 2009
@@ -96,9 +96,9 @@
             <type>jar</type>
         </dependency>
         <dependency start="false">
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <version>1.0</version>
             <type>jar</type>
         </dependency>
         <dependency start="false">

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml?rev=799921&r1=799920&r2=799921&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
Sat Aug  1 20:39:43 2009
@@ -106,13 +106,13 @@
         <type>jar</type>
         <import>classes</import>
       </dependency>
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+            <import>classes</import>
+        </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-activation_1.1_spec</artifactId>



Mime
View raw message