geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r650236 - in /geronimo/devtools/eclipse-plugin/trunk: ./ assembly/ assembly/src/main/assembly/ features/ features/org.apache.geronimo.v11.feature/ features/org.apache.geronimo.v20.feature/ features/org.apache.geronimo.v21.feature/ plugins/ ...
Date Mon, 21 Apr 2008 19:48:55 GMT
Author: mcconne
Date: Mon Apr 21 12:48:50 2008
New Revision: 650236

URL: http://svn.apache.org/viewvc?rev=650236&view=rev
Log:
Rename v21.jaxbmodel and eliminate v11 plugins and features

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/
      - copied from r650014, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath
      - copied unchanged from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.project
      - copied, changed from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/.project
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/LICENSE
      - copied unchanged from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/
      - copied from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/NOTICE
      - copied unchanged from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
      - copied, changed from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/
      - copied from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/
Removed:
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/
Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/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.st.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
    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.core/pom.xml
    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.v21.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Mon Apr 21 12:48:50 2008
@@ -61,13 +61,7 @@
          -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.v11.jaxbmodel</artifactId>
-            <version>${version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
+            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
            
@@ -79,12 +73,6 @@
            
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.v11</artifactId>
-            <version>${version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v20</artifactId>
             <version>${version}</version>
         </dependency>
@@ -109,18 +97,6 @@
            
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v11.core</artifactId>
-            <version>${version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v11.ui</artifactId>
-            <version>${version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v20.core</artifactId>
             <version>${version}</version>
         </dependency>
@@ -164,12 +140,6 @@
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
             <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v11.feature</artifactId>
-            <version>${version}</version>
         </dependency>
            
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Mon Apr
21 12:48:50 2008
@@ -45,16 +45,12 @@
             <outputDirectory>eclipse/plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v11.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v21.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
@@ -75,7 +71,6 @@
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.jetty.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.tomcat.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
             </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml Mon Apr 21
12:48:50 2008
@@ -32,10 +32,6 @@
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
 
-    <feature url="eclipse/features/org.apache.geronimo.v11.feature_2.1.0.jar" id="org.apache.geronimo.v11.feature"
version="2.1.0">
-        <category name="org.eclipse.wst.server.core.serverAdapter"/>
-    </feature>
-
     <feature url="eclipse/features/org.apache.geronimo.v20.feature_2.1.0.jar" id="org.apache.geronimo.v20.feature"
version="2.1.0">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Mon Apr
21 12:48:50 2008
@@ -35,16 +35,12 @@
             <outputDirectory>eclipse/plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v11.jaxbmodel</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v21.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
@@ -64,7 +60,6 @@
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.jetty.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.tomcat.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
             </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
Mon Apr 21 12:48:50 2008
@@ -39,11 +39,6 @@
         <update label="Apache Geronimo Eclipse Update Site" url="http://www.apache.org/dist/geronimo/eclipse/updates/"/>
     </url>
     
-    <includes
-        id="org.apache.geronimo.v11.feature"
-        version="2.1.0"
-        name="Geronimo v1.1.x Server Adapter"/>
-        
     <requires>
         <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
     </requires>
@@ -69,7 +64,7 @@
          version="2.1.0"/>
 
     <plugin
-         id="org.apache.geronimo.deployment.v11.jaxbmodel"
+         id="org.apache.geronimo.jee.v21.jaxbmodel"
          download-size="0"
          install-size="0"
          version="2.1.0"

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml
Mon Apr 21 12:48:50 2008
@@ -40,11 +40,6 @@
         <update label="Apache Geronimo Eclipse Update Site" url="http://www.apache.org/dist/geronimo/eclipse/updates/"/>
     </url>
     
-    <includes
-        id="org.apache.geronimo.v11.feature"
-        version="2.1.0"
-        name="Geronimo v1.1.x Server Adapter"/>
-        
     <requires>
         <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
     </requires>
@@ -70,7 +65,7 @@
          version="2.1.0"/>
 
     <plugin
-         id="org.apache.geronimo.deployment.v21.jaxbmodel"
+         id="org.apache.geronimo.jee.v21.jaxbmodel"
          download-size="0"
          install-size="0"
          version="2.1.0"

Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Mon Apr 21 12:48:50 2008
@@ -30,7 +30,6 @@
     </parent>
     <modules>
         <module>org.apache.geronimo.feature</module>
-        <module>org.apache.geronimo.v11.feature</module>
         <module>org.apache.geronimo.v20.feature</module>
         <module>org.apache.geronimo.v21.feature</module>
         <module>org.apache.geronimo.installableruntime.jetty.feature</module>

Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.project
(from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/.project)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.project?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.project&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/.project&r1=650222&r2=650236&rev=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/.project
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.project
Mon Apr 21 12:48:50 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.apache.geronimo.deployment.v21.jaxbmodel</name>
+	<name>org.apache.geronimo.jee.v21.jaxbmodel</name>
 	<comment></comment>
 	<projects>
 	</projects>

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=650236&r1=650222&r2=650236&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 Apr 21 12:48:50 2008
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V21 JAXB Models
-Bundle-SymbolicName: org.apache.geronimo.deployment.v21.jaxbmodel;singleton:=true
+Bundle-SymbolicName: org.apache.geronimo.jee.v21.jaxbmodel;singleton:=true
 Bundle-Version: 2.1.0
 Bundle-ClassPath: .
 Bundle-Vendor: Apache.org

Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
(from r650222, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml&r1=650222&r2=650236&rev=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
Mon Apr 21 12:48:50 2008
@@ -19,7 +19,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
   
-    <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
+    <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
     <packaging>jar</packaging>
     <name>${artifactId}</name>
     <parent>

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=650236&r1=650235&r2=650236&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 Apr 21 12:48:50 2008
@@ -24,7 +24,7 @@
  org.eclipse.wst.web,
  org.eclipse.jem.util,
  org.apache.geronimo.runtime.common,
- org.apache.geronimo.deployment.v21.jaxbmodel
+ org.apache.geronimo.jee.v21.jaxbmodel
 Eclipse-LazyStart: true
 Export-Package: org,
  org.apache,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Mon
Apr 21 12:48:50 2008
@@ -96,7 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
+            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
Mon Apr 21 12:48:50 2008
@@ -36,16 +36,13 @@
      */
     public String getClasspathContainerLabel(IRuntime runtime) {
         String version = runtime.getRuntimeType().getVersion();
-        if (version.equals("1.0")) {
-            return Messages.target10runtime;
+        if (version.equals("2.0")) {
+            return Messages.target20runtime;
         }
-        else if (version.equals("1.1")) {
-            return Messages.target11runtime;
+        else if (version.equals("2.1")) {
+            return Messages.target21runtime;
         }
-        else if (version.equals("1.2")) {
-            return Messages.target12runtime;
-        }
-        return Messages.target12runtime;
+        return Messages.target21runtime;
     }
 
     /* (non-Javadoc)

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
Mon Apr 21 12:48:50 2008
@@ -38,9 +38,9 @@
 	
 	public static String errorJRE;
 	
-	public static String target10runtime;
-	public static String target11runtime;
-	public static String target12runtime;
+	public static String target20runtime;
+	public static String target21runtime;
+	public static String target22runtime;
 	
 	public static String incorrectVersion;
 	public static String noVersion;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties
Mon Apr 21 12:48:50 2008
@@ -23,9 +23,9 @@
 REDEPLOY_FAIL=Redeploy of module failed.  See log for details.
 DM_CONNECTION_FAIL=Connection to deployment manager failed.  See log for details.
 
-target10runtime=Geronimo v1.0 Runtime
-target11runtime=Geronimo v1.1 Runtime
-target12runtime=Geronimo v1.2 Runtime
+target20runtime=Geronimo v2.0 Runtime
+target21runtime=Geronimo v2.1 Runtime
+target22runtime=Geronimo v2.2 Runtime
 
 incorrectVersion=An incorrect version of Geronimo was detected.  Version {0} was expected,
but version {1} was found.
 noVersion=A geronimo installation was detected, however the version could not be verified.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
Mon Apr 21 12:48:50 2008
@@ -15,5 +15,5 @@
  org.apache.geronimo.st.core,
  org.eclipse.jst.common.frameworks,
  org.eclipse.wst.common.modulecore,
- org.apache.geronimo.deployment.v21.jaxbmodel
+ org.apache.geronimo.jee.v21.jaxbmodel
 Eclipse-LazyStart: true

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
Mon Apr 21 12:48:50 2008
@@ -90,7 +90,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
+            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
Mon Apr 21 12:48:50 2008
@@ -14,6 +14,6 @@
  org.eclipse.wst.common.project.facet.ui,
  org.apache.geronimo.st.v21.ui,
  org.apache.geronimo.runtime.common,
- org.apache.geronimo.deployment.v21.jaxbmodel
+ org.apache.geronimo.jee.v21.jaxbmodel
 Eclipse-LazyStart: true
 Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml Mon
Apr 21 12:48:50 2008
@@ -77,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
+            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>

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=650236&r1=650235&r2=650236&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 Apr 21 12:48:50 2008
@@ -14,7 +14,7 @@
  org.apache.geronimo.st.core,
  org.eclipse.jst.common.frameworks,
  org.eclipse.wst.common.modulecore,
- org.apache.geronimo.deployment.v21.jaxbmodel
+ org.apache.geronimo.jee.v21.jaxbmodel
 Eclipse-LazyStart: true
 Export-Package: 
  org.apache.geronimo.st.v21.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
Mon Apr 21 12:48:50 2008
@@ -87,7 +87,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
+            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
     </dependencies>

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=650236&r1=650235&r2=650236&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 Apr 21 12:48:50 2008
@@ -12,7 +12,7 @@
  org.eclipse.ui.forms,
  org.eclipse.core.resources,
  org.eclipse.wst.common.project.facet.ui,
- org.apache.geronimo.deployment.v21.jaxbmodel,
+ org.apache.geronimo.jee.v21.jaxbmodel,
  org.apache.geronimo.runtime.common
 Eclipse-LazyStart: true
 Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml Mon
Apr 21 12:48:50 2008
@@ -77,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
+            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Mon Apr 21 12:48:50 2008
@@ -134,18 +134,14 @@
         </pluginManagement>
     </build>
     <modules>
-        <module>org.apache.geronimo.deployment.v11.jaxbmodel</module>
-        <module>org.apache.geronimo.deployment.v21.jaxbmodel</module>
+        <module>org.apache.geronimo.jee.v21.jaxbmodel</module>
         <module>org.apache.geronimo.st.core</module>
-        <module>org.apache.geronimo.st.v11.core</module>
         <module>org.apache.geronimo.st.v20.core</module>
         <module>org.apache.geronimo.st.v21.core</module>
         <module>org.apache.geronimo.st.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.runtime.common</module>
-        <module>org.apache.geronimo.runtime.v11</module>
         <module>org.apache.geronimo.runtime.v20</module>
         <module>org.apache.geronimo.runtime.v21</module>
     </modules>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=650236&r1=650235&r2=650236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Mon Apr 21 12:48:50 2008
@@ -85,7 +85,6 @@
     <properties>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
         <org.apache.geronimo.feature_version>2.1.0</org.apache.geronimo.feature_version>
-        <org.apache.geronimo.v11.feature_version>2.1.0</org.apache.geronimo.v11.feature_version>
         <org.apache.geronimo.v20.feature_version>2.1.0</org.apache.geronimo.v20.feature_version>
         <org.apache.geronimo.v21.feature_version>2.1.0</org.apache.geronimo.v21.feature_version>
         <org.apache.geronimo.installableruntime.tomcat.feature_version>2.1.0</org.apache.geronimo.installableruntime.tomcat.feature_version>



Mime
View raw message