geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r958478 - in /geronimo/devtools/eclipse-plugin/trunk: ./ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/ plugins/org.apache.geronimo.jaxbmodel.common/ plugins/org.apache.geronimo.jaxb...
Date Mon, 28 Jun 2010 07:09:16 GMT
Author: delos
Date: Mon Jun 28 07:09:15 2010
New Revision: 958478

URL: http://svn.apache.org/viewvc?rev=958478&view=rev
Log:
GERONIMODEVTOOLS-647 Synchronize dependency version with Geronimo 3.0 M1

Removed:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/services/
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/build.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -7,6 +7,7 @@ Bundle-ClassPath: .
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: 
+ org.apache.geronimo.runtime.common,
  org.apache.geronimo.jaxbmodel.common,
  org.eclipse.core.runtime,
  org.eclipse.core.resources

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml Mon Jun 28 07:09:15 2010
@@ -35,19 +35,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jaxb_2.2_spec</artifactId>
+	    </dependency>
+
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+		</dependency>
+	
+		<dependency>
+			<groupId>org.apache.geronimo.bundles</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -4,7 +4,7 @@ Bundle-Name: Common operation for Geroni
 Bundle-SymbolicName: org.apache.geronimo.jaxbmodel.common;singleton:=true
 Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.jaxbmodel.common.Activator
-Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport,
+Require-Bundle: org.apache.geronimo.runtime.common,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.jst.server.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/pom.xml Mon Jun 28 07:09:15 2010
@@ -34,21 +34,21 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-
+       <dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jaxb_2.2_spec</artifactId>
+	    </dependency>
+
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+		</dependency>
+	
+		<dependency>
+			<groupId>org.apache.geronimo.bundles</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
+		
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -6,7 +6,8 @@ Bundle-Version: 3.0.0
 Bundle-ClassPath: .
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.jaxbmodel.common,
+Require-Bundle: org.apache.geronimo.runtime.common,
+ org.apache.geronimo.jaxbmodel.common,
  org.eclipse.core.runtime,
  org.eclipse.core.resources
 Export-Package: org.apache.geronimo.jee.application,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/plugin.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/plugin.xml Mon Jun 28 07:09:15 2010
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
      <extension point="org.apache.geronimo.jaxbmodel.common.JAXBUtilsProvider">
-       <provider class="org.apache.geronimo.st.v21.core.jaxb.JAXB21Utils" version="2.0,2.1,2.2,3.0"/>
+       <provider class="org.apache.geronimo.jee.jaxbmodel.operations.JAXB21Utils" version="2.0,2.1,2.2,3.0"/>
     </extension>
 
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml Mon Jun 28 07:09:15 2010
@@ -35,19 +35,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jaxb_2.2_spec</artifactId>
+	    </dependency>
+
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+		</dependency>
+	
+		<dependency>
+			<groupId>org.apache.geronimo.bundles</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath Mon Jun 28 07:09:15 2010
@@ -2,10 +2,10 @@
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.1_3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-activation_1.1_spec-1.0.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.0.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-activation_1.1_spec-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-jaxb_2.2_spec-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-stax-api_1.2_spec-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2_1.jar" sourcepath="/media/g/tbd/jaxb/jaxb-impl-2.2-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -6,11 +6,11 @@ Bundle-Version: 3.0.0
 Bundle-ClassPath: 
  lib/commons-logging-1.1.1.jar,
  lib/cglib-nodep-2.1_3.jar,
- lib/jaxb-api-2.0.jar,
- lib/jaxb-impl-2.0.5.jar,
- lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
- lib/geronimo-activation_1.1_spec-1.0.3-SNAPSHOT.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1-SNAPSHOT.jar
+ lib/geronimo-jaxb_2.2_spec-1.0.jar,
+ lib/jaxb-impl-2.2_1.jar,
+ lib/geronimo-stax-api_1.2_spec-1.0.jar,
+ lib/geronimo-activation_1.1_spec-1.1.jar,
+ lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1.jar
 Export-Package: 
  com.sun.istack,
  com.sun.xml.bind,
@@ -39,14 +39,6 @@ Export-Package: 
  com.sun.xml.txw2,
  com.sun.xml.txw2.annotation,
  com.sun.xml.txw2.output,
- javax.enterprise.deploy.model,
- javax.enterprise.deploy.model.exceptions,
- javax.enterprise.deploy.shared,
- javax.enterprise.deploy.shared.factories,
- javax.enterprise.deploy.spi,
- javax.enterprise.deploy.spi.exceptions,
- javax.enterprise.deploy.spi.factories,
- javax.enterprise.deploy.spi.status,
  javax.xml.bind,
  javax.xml.bind.annotation,
  javax.xml.bind.annotation.adapters,
@@ -56,6 +48,14 @@ Export-Package: 
  javax.xml.stream,
  javax.xml.stream.events,
  javax.xml.stream.util,
+ javax.enterprise.deploy.model,
+ javax.enterprise.deploy.model.exceptions,
+ javax.enterprise.deploy.shared,
+ javax.enterprise.deploy.shared.factories,
+ javax.enterprise.deploy.spi,
+ javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories,
+ javax.enterprise.deploy.spi.status,
  net.sf.cglib.asm,
  net.sf.cglib.asm.attrs,
  net.sf.cglib.beans,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Mon Jun 28 07:09:15 2010
@@ -118,14 +118,14 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                                    <artifactId>geronimo-stax-api_1.2_spec</artifactId>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
+                                   <groupId>org.apache.geronimo.specs</groupId>
+									<artifactId>geronimo-jaxb_2.2_spec</artifactId>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>com.sun.xml.bind</groupId>
+                                    <groupId>org.apache.geronimo.bundles</groupId>
                                     <artifactId>jaxb-impl</artifactId>
                                 </artifactItem>
                                 <artifactItem>
@@ -187,29 +187,13 @@
             <artifactId>geronimo-javaee-deployment_1.1MR3_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>
-        </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>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jaxb_2.2_spec</artifactId>
+	    </dependency>	
+		<dependency>
+			<groupId>org.apache.geronimo.bundles</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath Mon Jun 28 07:09:15 2010
@@ -1,36 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!-- $Rev: 471551 $ $Date: 2006-11-05 17:47:11 -0500 (Sun, 05 Nov 2006) $ -->
-
 <classpath>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-common-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-connector-builder-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-deployment-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-builder-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-schema-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-naming-builder-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-security-builder-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-service-builder-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-system-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-util-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/geronimo-web-builder-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/openejb-builder-2.1.1.jar"/>
-</classpath>
\ No newline at end of file
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-common-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-connector-builder-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deployment-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-builder-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-schema-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-naming-builder-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-security-builder-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-service-builder-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-system-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-util-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-web-builder-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/openejb-builder-2.1.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -18,7 +18,8 @@ Bundle-ClassPath: lib/openejb-builder-2.
  lib/geronimo-deploy-jsr88-1.1.1.jar,
  lib/geronimo-connector-builder-1.1.1.jar,
  lib/geronimo-common-1.1.1.jar
-Export-Package: org.apache.geronimo.common,
+Export-Package: 
+ org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
  org.apache.geronimo.connector.deployment,
  org.apache.geronimo.connector.deployment.dconfigbean,
@@ -180,13 +181,11 @@ Export-Package: org.apache.geronimo.comm
  schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
  schemaorg_apache_xmlbeans.src.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001,
  schemaorg_apache_xmlbeans.src.modules,
- schemaorg_apache_xmlbeans.system.sD81E1984D3B5AFD019AC1E421CD645AD,
  schemaorg_apache_xmlbeans.system.s624ECD384556376FBF6D19CFF950A0F4,
- schemaorg_apache_xmlbeans.system.sC0CFD54C10B8C0292B30704501EF82FF,
  schemaorg_apache_xmlbeans.system.s686B996523AFA8A7C9F05CB07BC216B9,
  schemaorg_apache_xmlbeans.system.sC0CFD54C10B8C0292B30704501EF82FF,
- schemaorg_apache_xmlbeans.system.s686B996523AFA8A7C9F05CB07BC216B9,
  schemaorg_apache_xmlbeans.system.sD54265BC20BB40986932114D35E4E1A4,
+ schemaorg_apache_xmlbeans.system.sD81E1984D3B5AFD019AC1E421CD645AD,
  schemaorg_apache_xmlbeans.type.URI_SHA_1_02483D38844388463B74BE7AE0EF65015157E4C4,
  schemaorg_apache_xmlbeans.type.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
  schemaorg_apache_xmlbeans.type.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/build.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/build.properties?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/build.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/build.properties Mon Jun 28 07:09:15 2010
@@ -4,4 +4,5 @@ bin.includes = .classpath,\
                lib/,\
                META-INF/,\
                pom.xml,\
-               target/
+               target/,\
+               lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1.jar

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -11,8 +11,7 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-kernel-2.0.2.jar,
  lib/geronimo-system-2.0.2.jar,
  lib/geronimo-util-2.0.2.jar,
- lib/geronimo-deploy-config-2.0.2.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1-SNAPSHOT.jar
+ lib/geronimo-deploy-config-2.0.2.jar
 Export-Package: 
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -13,7 +13,6 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-system-2.1.4.jar,
  lib/geronimo-util-2.1.4.jar,
  lib/geronimo-deploy-config-2.1.4.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1-SNAPSHOT.jar,
  lib/plexus-archiver-1.0-alpha-12.jar,
  lib/geronimo-crypto-2.1.4.jar,
  lib/slf4j-api-1.5.5.jar,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -13,7 +13,6 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-system-2.2.jar,
  lib/geronimo-util-2.2.jar,
  lib/geronimo-deploy-config-2.2.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1-SNAPSHOT.jar,
  lib/plexus-archiver-1.0-alpha-12.jar,
  lib/geronimo-crypto-2.2.jar,
  lib/slf4j-api-1.5.5.jar,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.classpath?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.classpath Mon Jun 28 07:09:15 2010
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-common-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-crypto-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-config-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-deployment-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-schema-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-plugin-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-system-3.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.osgi.compendium-4.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.osgi.core-4.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/plexus-archiver-1.0-alpha-12.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-1.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-common-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-crypto-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-config-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deployment-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-schema-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-plugin-3.0-M1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-system-3.0-M1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -4,24 +4,21 @@ Bundle-Name: Geronimo V30 Runtime Plug-i
 Bundle-SymbolicName: org.apache.geronimo.runtime.v30;singleton:=true
 Bundle-Version: 3.0.0
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport,
- org.eclipse.osgi;bundle-version="3.6.0"
-Bundle-ClassPath: lib/geronimo-common-3.0-SNAPSHOT.jar,
- lib/geronimo-deploy-jsr88-3.0-SNAPSHOT.jar,
- lib/geronimo-deployment-3.0-SNAPSHOT.jar,
- lib/geronimo-j2ee-schema-3.0-SNAPSHOT.jar,
- lib/geronimo-kernel-3.0-SNAPSHOT.jar,
- lib/geronimo-plugin-3.0-SNAPSHOT.jar,
- lib/geronimo-system-3.0-SNAPSHOT.jar,
- lib/geronimo-util-3.0-SNAPSHOT.jar,
- lib/geronimo-deploy-config-3.0-SNAPSHOT.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1-SNAPSHOT.jar,
+ org.eclipse.osgi
+Bundle-ClassPath: lib/geronimo-common-3.0-M1.jar,
+ lib/geronimo-deploy-jsr88-3.0-M1.jar,
+ lib/geronimo-deployment-3.0-M1.jar,
+ lib/geronimo-j2ee-schema-3.0-M1.jar,
+ lib/geronimo-kernel-3.0-M1.jar,
+ lib/geronimo-plugin-3.0-M1.jar,
+ lib/geronimo-system-3.0-M1.jar,
+ lib/geronimo-util-3.0-M1.jar,
+ lib/geronimo-deploy-config-3.0-M1.jar,
  lib/plexus-archiver-1.0-alpha-12.jar,
- lib/geronimo-crypto-3.0-SNAPSHOT.jar,
+ lib/geronimo-crypto-3.0-M1.jar,
  lib/slf4j-api-1.5.5.jar,
- lib/slf4j-simple-1.5.5.jar,
- lib/org.osgi.compendium-4.2.0.jar,
- lib/org.osgi.core-4.2.0.jar
-Export-Package: 
+ lib/slf4j-simple-1.5.5.jar
+Export-Package:  
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
  org.apache.geronimo.deployment,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/pom.xml Mon Jun 28 07:09:15 2010
@@ -33,7 +33,7 @@
     </parent>
 
     <properties>
-        <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>3.0-M1</geronimoVersion>
     </properties>
     <build>
         <resources>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -7,8 +7,8 @@ Bundle-Activator: org.apache.geronimo.st
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: 
- org.apache.geronimo.runtime.common;visibility:=reexport,
- org.apache.geronimo.jaxbmodel.common;visibility:=reexport,
+ org.apache.geronimo.runtime.common,
+ org.apache.geronimo.jaxbmodel.common,
  org.eclipse.core.runtime,
  org.eclipse.jst.j2ee,
  org.eclipse.jst.j2ee.web,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -8,6 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.apache.geronimo.st.core;visibility:=reexport,
+ org.apache.geronimo.jaxbmodel.common;bundle-version="3.0.0",
  org.eclipse.core.runtime,
  org.eclipse.wst.server.core,
  org.eclipse.ui.forms,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -8,6 +8,7 @@ Bundle-Vendor: Apache.org
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.v11,
  org.apache.geronimo.st.core,
+ org.apache.geronimo.jaxbmodel.common,
  org.apache.geronimo.j2ee.v11.jaxbmodel,
  org.eclipse.core.runtime,
  org.eclipse.wst.server.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -9,6 +9,7 @@ Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.v11,
  org.apache.geronimo.st.ui,
  org.apache.geronimo.j2ee.v11.jaxbmodel,
+ org.apache.geronimo.jaxbmodel.common,
  org.apache.geronimo.st.v11.core,
  org.eclipse.ui,
  org.eclipse.core.runtime,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -6,7 +6,8 @@ Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.st.v21.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.st.core,
+Require-Bundle: org.apache.geronimo.jaxbmodel.common,
+ org.apache.geronimo.st.core,
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.apache.geronimo.runtime.v21,
  org.eclipse.jst.j2ee,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -6,6 +6,7 @@ Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.st.v21.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.common,
+ org.apache.geronimo.jaxbmodel.common,
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.apache.geronimo.st.v21.core,
  org.apache.geronimo.st.ui,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -6,7 +6,8 @@ Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.st.v21.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.runtime.v22,
+Require-Bundle: org.apache.geronimo.jaxbmodel.common,
+ org.apache.geronimo.runtime.v22,
  org.apache.geronimo.st.v21.core,
  org.apache.geronimo.st.core,
  org.apache.geronimo.jee.v21.jaxbmodel,
@@ -15,5 +16,5 @@ Require-Bundle: org.apache.geronimo.runt
  org.eclipse.debug.core,
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.modulecore
+ org.eclipse.wst.common.modulecore 
 Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF Mon Jun 28 07:09:15 2010
@@ -7,9 +7,10 @@ Bundle-Activator: org.apache.geronimo.st
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: 
- org.apache.geronimo.jee.v21.jaxbmodel,
- org.apache.geronimo.st.v30.jaxbmodel,
  org.apache.geronimo.runtime.v30,
+ org.apache.geronimo.jaxbmodel.common,
+ org.apache.geronimo.jee.v21.jaxbmodel,
+ org.apache.geronimo.st.v30.jaxbmodel, 
  org.eclipse.core.commands,
  org.eclipse.jst.j2ee,
  org.eclipse.core.runtime,
@@ -28,6 +29,10 @@ Require-Bundle: 
  org.eclipse.wst.common.frameworks,
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.wst.server.core,
+ org.eclipse.hyades.trace.ui;resolution:=optional,
+ org.eclipse.tptp.trace.jvmti.client;resolution:=optional,
+ org.eclipse.tptp.platform.profile.server.core;resolution:=optional,
+ org.eclipse.tptp.platform.jvmti.client;resolution:=optional,
  org.eclipse.wst.web
 Bundle-ActivationPolicy: lazy
 Export-Package: 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/pom.xml Mon Jun 28 07:09:15 2010
@@ -34,20 +34,20 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
+       <dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jaxb_2.2_spec</artifactId>
+	    </dependency>
+
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+		</dependency>
+	
+		<dependency>
+			<groupId>org.apache.geronimo.bundles</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=958478&r1=958477&r2=958478&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Mon Jun 28 07:09:15 2010
@@ -22,7 +22,7 @@
                         
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin</name>
                         
@@ -104,46 +104,22 @@
                 <scope>compile</scope>
             </dependency>
                         
-            <!-- 
-             ###########################################################################################################
-             ##                                                                                                       ##
-             ## Upgrade the jaxb-api and jaxb-impl dependencies with care as the 2.2 versions will result in these    ##
-             ## exceptions: com.sun.xml.bind.v2.runtime.IllegalAnnotationsException                                   ##
-             ##                                                                                                       ##
-             ###########################################################################################################
-             -->
-            <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>
-            </dependency>
+            <dependency>
+		<groupId>org.apache.geronimo.specs</groupId>
+		<artifactId>geronimo-jaxb_2.2_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.2</version>
             </dependency>
                         
             <dependency>
-                <groupId>com.sun.xml.bind</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>2.2_1</version>               
             </dependency>
                         
             <dependency>
@@ -167,7 +143,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.3-SNAPSHOT</version>
+                <version>1.1</version>
             </dependency>
 
             <dependency>
@@ -179,13 +155,13 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                <version>1.0.1-SNAPSHOT</version>
+                <version>1.0</version>
             </dependency>
                         
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                <version>1.0.1</version>
+                <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+                <version>1.0</version>
             </dependency>
 
             <dependency>



Mime
View raw message