geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r950918 - in /geronimo/devtools/eclipse-plugin/branches/2.2.1: ./ plugins/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/ plugins/org.apache.geronimo.jee.v21.jaxbmodel/ plugins/org.apache.geronimo.runtime.common/ plugins/org.apache.geronim...
Date Thu, 03 Jun 2010 09:16:44 GMT
Author: delos
Date: Thu Jun  3 09:16:42 2010
New Revision: 950918

URL: http://svn.apache.org/viewvc?rev=950918&view=rev
Log:
synchronize GEP 2.2.1 dependency with Geronimo Server 2.2.1

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/testsuite/eclipse/build.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
Thu Jun  3 09:16:42 2010
@@ -30,10 +30,17 @@
     </parent>
 
     <dependencies>
+                     
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>       
+        </dependency>
+        
+         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>           
         
         </dependency>
+        
 
         <dependency>
             <groupId>com.sun.xml.bind</groupId>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
Thu Jun  3 09:16:42 2010
@@ -31,8 +31,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>	    
         </dependency>
 
         <dependency>
@@ -43,6 +43,12 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+             <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
 
         <dependency>
@@ -59,6 +65,11 @@
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
         </dependency>
+        
+         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>           
         
+        </dependency>
 
     </dependencies>
 

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
Thu Jun  3 09:16:42 2010
@@ -7,8 +7,8 @@ Bundle-ClassPath: 
  lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar,
  lib/commons-logging-1.0.4.jar,
  lib/cglib-nodep-2.1_3.jar,
- lib/jaxb-api-2.0.jar,
- lib/jaxb-impl-2.0.5.jar,
+ lib/geronimo-jaxb_2.1_spec-1.0.jar,
+ lib/jaxb-impl-2.1.12.jar,
  lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
  lib/geronimo-activation_1.1_spec-1.0.2.jar
 Export-Package: 

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
Thu Jun  3 09:16:42 2010
@@ -115,8 +115,8 @@
                                     <artifactId>geronimo-stax-api_1.0_spec</artifactId>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
+                                       <groupId>org.apache.geronimo.specs</groupId>
+                                       <artifactId>geronimo-jaxb_2.1_spec</artifactId>
                             
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>com.sun.xml.bind</groupId>
@@ -198,29 +198,21 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-            </exclusions>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.12</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
Thu Jun  3 09:16:42 2010
@@ -4,18 +4,18 @@ Bundle-Name: Geronimo V21 Runtime Plug-i
 Bundle-SymbolicName: org.apache.geronimo.runtime.v21;singleton:=true
 Bundle-Version: 2.2.1
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-2.1.4.jar,
- lib/geronimo-deploy-jsr88-2.1.4.jar,
- lib/geronimo-deployment-2.1.4.jar,
- lib/geronimo-j2ee-schema-2.1.4.jar,
- lib/geronimo-kernel-2.1.4.jar,
- lib/geronimo-plugin-2.1.4.jar,
- lib/geronimo-system-2.1.4.jar,
- lib/geronimo-util-2.1.4.jar,
- lib/geronimo-deploy-config-2.1.4.jar,
+Bundle-ClassPath: lib/geronimo-common-2.1.5.jar,
+ lib/geronimo-deploy-jsr88-2.1.5.jar,
+ lib/geronimo-deployment-2.1.5.jar,
+ lib/geronimo-j2ee-schema-2.1.5.jar,
+ lib/geronimo-kernel-2.1.5.jar,
+ lib/geronimo-plugin-2.1.5.jar,
+ lib/geronimo-system-2.1.5.jar,
+ lib/geronimo-util-2.1.5.jar,
+ lib/geronimo-deploy-config-2.1.5.jar,
  lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
  lib/plexus-archiver-1.0-alpha-7.jar,
- lib/geronimo-crypto-2.1.4.jar,
+ lib/geronimo-crypto-2.1.5.jar,
  lib/slf4j-api-1.4.3.jar,
  lib/slf4j-simple-1.4.3.jar
 Export-Package: 

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
Thu Jun  3 09:16:42 2010
@@ -27,7 +27,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
-        <geronimoVersion>2.1.4</geronimoVersion>
+        <geronimoVersion>2.1.5</geronimoVersion>
     </properties>
     <build>
         <resources>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
Thu Jun  3 09:16:42 2010
@@ -4,18 +4,18 @@ Bundle-Name: Geronimo V22 Runtime Plug-i
 Bundle-SymbolicName: org.apache.geronimo.runtime.v22;singleton:=true
 Bundle-Version: 2.2.1
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-2.2.jar,
- lib/geronimo-deploy-jsr88-2.2.jar,
- lib/geronimo-deployment-2.2.jar,
- lib/geronimo-j2ee-schema-2.2.jar,
- lib/geronimo-kernel-2.2.jar,
- lib/geronimo-plugin-2.2.jar,
- lib/geronimo-system-2.2.jar,
- lib/geronimo-util-2.2.jar,
- lib/geronimo-deploy-config-2.2.jar,
+Bundle-ClassPath: lib/geronimo-common-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-deploy-jsr88-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-deployment-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-j2ee-schema-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-kernel-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-plugin-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-system-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-util-2.2.1-SNAPSHOT.jar,
+ lib/geronimo-deploy-config-2.2.1-SNAPSHOT.jar,
  lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
  lib/plexus-archiver-1.0-alpha-7.jar,
- lib/geronimo-crypto-2.2.jar,
+ lib/geronimo-crypto-2.2.1-SNAPSHOT.jar,
  lib/slf4j-api-1.4.3.jar,
  lib/slf4j-simple-1.4.3.jar
 Export-Package: 

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml
Thu Jun  3 09:16:42 2010
@@ -27,7 +27,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
-        <geronimoVersion>2.2</geronimoVersion>
+        <geronimoVersion>2.2.1-SNAPSHOT</geronimoVersion>
     </properties>
     <build>
         <resources>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/pom.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/pom.xml Thu Jun  3 09:16:42 2010
@@ -144,12 +144,12 @@
         <module>org.apache.geronimo.st.ui</module>
         <module>org.apache.geronimo.st.v11.schemas</module>
         <module>org.apache.geronimo.st.schemas</module>
-				<module>org.apache.geronimo.st.v11.ui</module>       
+	<module>org.apache.geronimo.st.v11.ui</module>       
         <module>org.apache.geronimo.st.v20.ui</module>
         <module>org.apache.geronimo.st.v21.ui</module>
         <module>org.apache.geronimo.st.v22.ui</module>
         <module>org.apache.geronimo.runtime.common</module>
-				<module>org.apache.geronimo.runtime.v11</module>
+	<module>org.apache.geronimo.runtime.v11</module>
         <module>org.apache.geronimo.runtime.v20</module>
         <module>org.apache.geronimo.runtime.v21</module>
         <module>org.apache.geronimo.runtime.v22</module>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/pom.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/pom.xml Thu Jun  3 09:16:42 2010
@@ -84,7 +84,6 @@
                         
     <properties>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
-        <org.apache.geronimo.v21.feature_version>2.2.1</org.apache.geronimo.v21.feature_version>
         <org.apache.geronimo.v22.feature_version>2.2.1</org.apache.geronimo.v22.feature_version>
         <keystoreAlias>devtools</keystoreAlias> 
         <keystoreFile>keystore</keystoreFile> 
@@ -105,35 +104,25 @@
             </dependency>
                         
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                <version>1.0</version>
             </dependency>
                         
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-xjc</artifactId>
-                <version>2.0.5</version>
+                <version>2.1.12</version>
             </dependency>
                         
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
+                <version>2.1.12</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>activation</artifactId>
+                        <artifactId>jaxb-api</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/testsuite/eclipse/build.xml?rev=950918&r1=950917&r2=950918&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/testsuite/eclipse/build.xml Thu Jun  3
09:16:42 2010
@@ -29,11 +29,11 @@
 <project name="TestsuiteArtifacts">
 
     <target name="init">
-        <property name="galileo_url"            value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/galileo/SR1/"/>
-        <property name="galileo_jee_win32"      value="eclipse-jee-galileo-SR1-win32.zip"/>
-        <property name="galileo_jee_linux"      value="eclipse-jee-galileo-SR1-linux-gtk.tar"/>
-        <property name="galileo_jee_linux-x86_64" value="eclipse-jee-galileo-SR1-linux-gtk-x86_64.tar"/>
-        <property name="galileo_jee_macos"      value="eclipse-jee-galileo-SR1-macosx-carbon.tar"/>
+        <property name="galileo_url"            value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/galileo/SR2/"/>
+        <property name="galileo_jee_win32"      value="eclipse-jee-galileo-SR2-win32.zip"/>
+        <property name="galileo_jee_linux"      value="eclipse-jee-galileo-SR2-linux-gtk.tar"/>
+        <property name="galileo_jee_linux-x86_64" value="eclipse-jee-galileo-SR2-linux-gtk-x86_64.tar"/>
+        <property name="galileo_jee_macos"      value="eclipse-jee-galileo-SR2-macosx-carbon.tar"/>
         <property name="galileo_jee_linux_gz"   value="${galileo_jee_linux}.gz"/>
         <property name="galileo_jee_linux-x86_64_gz" value="${galileo_jee_linux-x86_64}.gz"/>
         <property name="galileo_jee_macos_gz"   value="${galileo_jee_macos}.gz"/>



Mime
View raw message