geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r633644 - in /geronimo/devtools/eclipse-plugin/trunk: ./ assembly/ assembly/src/main/assembly/ emf/ features/ plugins/ plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ plugins/org.apache.geronimo.st.ui/src/org/apache/ger...
Date Tue, 04 Mar 2008 21:09:50 GMT
Author: mcconne
Date: Tue Mar  4 13:09:49 2008
New Revision: 633644

URL: http://svn.apache.org/viewvc?rev=633644&view=rev
Log:
GERONIMODEVTOOLS-265 Comment out v1.0 artifacts -- will delete later if no problems arise

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/emf/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.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=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Tue Mar  4 13:09:49 2008
@@ -34,7 +34,7 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>geronimo-eclipse-plugin-${version}-SNAPSHOT</finalName>
+                    <finalName>geronimo-eclipse-plugin-${version}-RC1</finalName>
                     <descriptors>
                         <descriptor>src/main/assembly/deployable.xml</descriptor>
                         <descriptor>src/main/assembly/updatesite.xml</descriptor>
@@ -57,11 +57,11 @@
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${version}</version>
         </dependency>
-        <dependency>
+<!--    <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v1.core</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency>                                       -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v11.core</artifactId>
@@ -127,11 +127,11 @@
             <artifactId>org.apache.geronimo.st.ui</artifactId>
             <version>${version}</version>
         </dependency>
-        <dependency>
+<!--    <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v1.ui</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency>                                       -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v11.ui</artifactId>
@@ -152,11 +152,11 @@
             <artifactId>org.apache.geronimo.feature</artifactId>
             <version>${version}</version>
         </dependency>
-        <dependency>
+<!---    <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.v10.feature</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency>                                       -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.v11.feature</artifactId>

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=633644&r1=633643&r2=633644&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 Tue Mar
 4 13:09:49 2008
@@ -44,14 +44,14 @@
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</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.v1.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
     -->
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.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>

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=633644&r1=633643&r2=633644&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 Tue Mar  4
13:09:49 2008
@@ -44,8 +44,8 @@
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
 
-    <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.jar"
-             id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1">
+    <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0.jar"
+             id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.0">
         <category name="Geronimo Runtime"/>
     </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=633644&r1=633643&r2=633644&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 Tue Mar
 4 13:09:49 2008
@@ -34,14 +34,14 @@
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</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.v1.core</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
     -->
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.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>

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml?rev=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml Tue Mar  4 13:09:49 2008
@@ -87,7 +87,7 @@
         </pluginManagement>
     </build>
     <modules>
-        <module>geronimo-1.0</module>
+<!--    <module>geronimo-1.0</module>   -->
         <module>geronimo-1.1</module>
     </modules>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Tue Mar  4 13:09:49 2008
@@ -30,7 +30,7 @@
     </parent>
     <modules>
         <module>org.apache.geronimo.feature</module>
-        <module>org.apache.geronimo.v10.feature</module>
+<!--    <module>org.apache.geronimo.v10.feature</module>    -->
         <module>org.apache.geronimo.v11.feature</module>
         <module>org.apache.geronimo.v20.feature</module>
         <module>org.apache.geronimo.v21.feature</module>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java?rev=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
Tue Mar  4 13:09:49 2008
@@ -178,7 +178,7 @@
         }
 
         // 
-        // Check pre-2.1repository if necessary
+        // Check pre-2.1 repository if necessary
         //
         if (systemjarURL == null) {
             File systemDir = getRuntime().getLocation().append("repository/org/apache/geronimo/modules/geronimo-system").toFile();

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?rev=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Tue Mar  4 13:09:49 2008
@@ -233,7 +233,7 @@
                                                                                         
               : gWithJetty);
                                                  String version = installable.getFeatureVersion();
                                                  if ( version.startsWith("2.1") ) {
-                                                     installPath = installPath.append("geronimo-"
+ (tomcat.getSelection() ? "tomcat6" : "jetty6") + "-javaee5-" + version);
+                                                     installPath = installPath.append("geronimo-"
+ (tomcat.getSelection() ? "tomcat6" : "jetty6") + "-javaee5-" + "2.1" );
                                                  }
                                                  else {
                                                      if ( version.startsWith("2.0") ) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml?rev=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
Tue Mar  4 13:09:49 2008
@@ -78,14 +78,14 @@
         <installableRuntime id="org.apache.geronimo.runtime.tomcat.21"
             featureVersion="2.1.0"
             featureId="org.apache.geronimo.installableruntime.tomcat.feature"
-            featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            path="geronimo-tomcat6-jee5-2.1.0.zip">
+            featureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
+            path="geronimo-tomcat6-javaee5-2.1.0.zip">
         </installableRuntime>
         <installableRuntime id="org.apache.geronimo.runtime.jetty.21"
             featureVersion="2.1.0"
             featureId="org.apache.geronimo.installableruntime.jetty.feature"
-            featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            path="geronimo-jetty6-jee5-2.1.0.zip">
+            featureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
+            path="geronimo-jetty6-javaee5-2.1.0.zip">
         </installableRuntime>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Tue Mar  4 13:09:49 2008
@@ -131,12 +131,12 @@
     </build>
     <modules>
         <module>org.apache.geronimo.st.core</module>
-        <module>org.apache.geronimo.st.v1.core</module>
+<!--    <module>org.apache.geronimo.st.v1.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.v1.ui</module>
+<!--    <module>org.apache.geronimo.st.v1.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>
@@ -145,7 +145,7 @@
         <module>org.apache.geronimo.v11.deployment.model</module>
         <module>org.apache.geronimo.v11.deployment.model.edit</module>
         <module>org.apache.geronimo.runtime.common</module>
-        <module>org.apache.geronimo.runtime.v1</module>
+<!--    <module>org.apache.geronimo.runtime.v1</module>     -->
         <module>org.apache.geronimo.runtime.v11</module>
         <module>org.apache.geronimo.runtime.v20</module>
         <module>org.apache.geronimo.runtime.v21</module>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=633644&r1=633643&r2=633644&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Tue Mar  4 13:09:49 2008
@@ -85,7 +85,7 @@
     <properties>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
         <org.apache.geronimo.feature_version>2.1.0</org.apache.geronimo.feature_version>
-        <org.apache.geronimo.v10.feature_version>2.1.0</org.apache.geronimo.v10.feature_version>
+<!--    <org.apache.geronimo.v10.feature_version>2.1.0</org.apache.geronimo.v10.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>
@@ -144,7 +144,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.devtools</groupId>
                     <artifactId>maven-eclipsepde-plugin</artifactId>
-                    <version>1.0-SNAPSHOT</version>
+                    <version>1.0</version>
                     <configuration>
                         <eclipseHome>${settings.localRepository}/eclipse/eclipse/</eclipseHome>
                     </configuration>
@@ -153,7 +153,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.devtools</groupId>
                     <artifactId>maven-emf-plugin</artifactId>
-                    <version>1.0-SNAPSHOT</version>
+                    <version>1.0</version>
                 </plugin>
                 
                 <plugin>



Mime
View raw message