geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r573206 - in /geronimo/devtools/eclipse-plugin/branches/2.0.0: ./ assembly/ assembly/src/main/assembly/ features/org.apache.geronimo.feature/ features/org.apache.geronimo.installableruntime.jetty.feature/ features/org.apache.geronimo.instal...
Date Thu, 06 Sep 2007 09:53:53 GMT
Author: mcconne
Date: Thu Sep  6 02:53:51 2007
New Revision: 573206

URL: http://svn.apache.org/viewvc?rev=573206&view=rev
Log:
Ensure Eclipse download site(s) are properly handled

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/src/main/assembly/site.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.feature/feature.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v10.feature/feature.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v11.feature/feature.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v12.feature/feature.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v20.feature/feature.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.0/pom.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/pom.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/pom.xml Thu Sep  6 02:53:51 2007
@@ -165,12 +165,12 @@
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
-            <version>${version}</version>
+            <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
-            <version>${version}</version>
+            <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/src/main/assembly/site.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/assembly/src/main/assembly/site.xml Thu
Sep  6 02:53:51 2007
@@ -45,19 +45,19 @@
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
     
-    <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0.jar"
-             id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.0">
+    <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1.jar"
+             id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.1">
         <category name="Geronimo Runtime"/>
     </feature>
     
-    <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0.jar"
-             id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.0">
+    <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1.jar"
+             id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.1">
         <category name="Geronimo Runtime"/>
     </feature>
     
-    <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0/geronimo-tomcat6-jee5-2.0.zip"
-             url="runtimes/geronimo-tomcat6-jee5-2.0.2.zip"/>
-    <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0/geronimo-jetty6-jee5-2.0.zip"
-             url="runtimes/geronimo-jetty6-jee5-2.0.2.zip"/>
+    <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1/geronimo-tomcat6-jee5-2.0.1.zip"
+             url="runtimes/geronimo-tomcat6-jee5-2.0.1-bin.zip"/>
+    <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1/geronimo-jetty6-jee5-2.0.1.zip"
+             url="runtimes/geronimo-jetty6-jee5-2.0.1-bin.zip"/>
     
 </site>

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.feature/feature.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.feature/feature.xml
Thu Sep  6 02:53:51 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.feature"
       label="Geronimo Core Feature"

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
Thu Sep  6 02:53:51 2007
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-jetty6-jee5-2.0.zip"
+    id="geronimo-jetty6-jee5-${org.apache.geronimo.installableruntime.jetty.feature_version}.zip"
     download-size="0"
     install-size="0"/>
 

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
Thu Sep  6 02:53:51 2007
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-tomcat6-jee5-2.0.zip"
+    id="geronimo-tomcat6-jee5-${org.apache.geronimo.installableruntime.tomcat.feature_version}.zip"
     download-size="0"
     install-size="0"/>
 

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v10.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v10.feature/feature.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v10.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v10.feature/feature.xml
Thu Sep  6 02:53:51 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v10.feature"
       label="Geronimo v1.0 Server Adapter"

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v11.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v11.feature/feature.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v11.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v11.feature/feature.xml
Thu Sep  6 02:53:51 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v11.feature"
       label="Geronimo v1.1.x Server Adapter"

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v12.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v12.feature/feature.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v12.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v12.feature/feature.xml
Thu Sep  6 02:53:51 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v12.feature"
       label="Geronimo v1.2 Server Adapter"

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v20.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v20.feature/feature.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v20.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/features/org.apache.geronimo.v20.feature/feature.xml
Thu Sep  6 02:53:51 2007
@@ -1,4 +1,21 @@
 <?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.
+  -->
+
 <feature
       id="org.apache.geronimo.v20.feature"
       label="Geronimo v2.0 Server Adapter"

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/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/branches/2.0.0/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Thu Sep  6 02:53:51 2007
@@ -228,9 +228,9 @@
 					InstallableRuntime installable = (InstallableRuntime) (tomcat.getSelection() ? gWithTomcat
 							: gWithJetty);
 					String version = installable.getFeatureVersion();
-					if (version.endsWith(".0"))
-						version = version.substring(0, version.lastIndexOf(".0"));
-					installPath = installPath.append("geronimo-" + version);
+//              			if (version.endsWith(".0"))
+//		                		version = version.substring(0, version.lastIndexOf(".0"));
+					installPath = installPath.append("geronimo-" + (tomcat.getSelection() ? "tomcat6" :
"jetty6") + "-jee5-" + version);
 					installDir.setText(installPath.toOSString());
 				}
 			});

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.v20.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.v20.core/plugin.xml
Thu Sep  6 02:53:51 2007
@@ -50,16 +50,16 @@
     
     <extension point="org.eclipse.wst.server.core.installableRuntimes">
         <installableRuntime id="org.apache.geronimo.runtime.tomcat.20"
-            featureVersion="2.0.0"
+            featureVersion="2.0.1"
             featureId="org.apache.geronimo.installableruntime.tomcat.feature"
             featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            path="geronimo-tomcat-j2ee-2.0.zip">
+            path="geronimo-tomcat6-jee5-2.0.1.zip">
         </installableRuntime>
         <installableRuntime id="org.apache.geronimo.runtime.jetty.20"
-            featureVersion="2.0.0"
+            featureVersion="2.0.1"
             featureId="org.apache.geronimo.installableruntime.jetty.feature"
             featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            path="geronimo-jetty-j2ee-2.0.zip">
+            path="geronimo-jetty6-jee5-2.0.1.zip">
         </installableRuntime>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/pom.xml?rev=573206&r1=573205&r2=573206&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/pom.xml Thu Sep  6 02:53:51 2007
@@ -89,8 +89,8 @@
         <org.apache.geronimo.v11.feature_version>2.0.0</org.apache.geronimo.v11.feature_version>
         <org.apache.geronimo.v12.feature_version>2.0.0</org.apache.geronimo.v12.feature_version>
         <org.apache.geronimo.v20.feature_version>2.0.0</org.apache.geronimo.v20.feature_version>
-        <org.apache.geronimo.installableruntime.tomcat.feature_version>2.0.0</org.apache.geronimo.installableruntime.tomcat.feature_version>
-        <org.apache.geronimo.installableruntime.jetty.feature_version>2.0.0</org.apache.geronimo.installableruntime.jetty.feature_version>
+        <org.apache.geronimo.installableruntime.tomcat.feature_version>2.0.1</org.apache.geronimo.installableruntime.tomcat.feature_version>
+        <org.apache.geronimo.installableruntime.jetty.feature_version>2.0.1</org.apache.geronimo.installableruntime.jetty.feature_version>
     </properties>
                         
     <dependencyManagement>



Mime
View raw message