Skip to content

Commit 6b8f950

Browse files
author
Tim McConnell
committed
Ensure Eclipse download site(s) are properly handled
git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/branches/2.0.0@573206 13f79535-47bb-0310-9956-ffa450edef68
1 parent e7ba175 commit 6b8f950

File tree

12 files changed

+106
-21
lines changed

12 files changed

+106
-21
lines changed

‎assembly/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@
165165
<dependency>
166166
<groupId>org.apache.geronimo.devtools</groupId>
167167
<artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
168-
<version>${version}</version>
168+
<version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
169169
</dependency>
170170
<dependency>
171171
<groupId>org.apache.geronimo.devtools</groupId>
172172
<artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
173-
<version>${version}</version>
173+
<version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
174174
</dependency>
175175
</dependencies>
176176
</project>

‎assembly/src/main/assembly/site.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@
4545
<category name="org.eclipse.wst.server.core.serverAdapter"/>
4646
</feature>
4747

48-
<feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0.jar"
49-
id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.0">
48+
<feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1.jar"
49+
id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.1">
5050
<category name="Geronimo Runtime"/>
5151
</feature>
5252

53-
<feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0.jar"
54-
id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.0">
53+
<feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1.jar"
54+
id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.1">
5555
<category name="Geronimo Runtime"/>
5656
</feature>
5757

58-
<archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0/geronimo-tomcat6-jee5-2.0.zip"
59-
url="runtimes/geronimo-tomcat6-jee5-2.0.2.zip"/>
60-
<archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0/geronimo-jetty6-jee5-2.0.zip"
61-
url="runtimes/geronimo-jetty6-jee5-2.0.2.zip"/>
58+
<archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1/geronimo-tomcat6-jee5-2.0.1.zip"
59+
url="runtimes/geronimo-tomcat6-jee5-2.0.1-bin.zip"/>
60+
<archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1/geronimo-jetty6-jee5-2.0.1.zip"
61+
url="runtimes/geronimo-jetty6-jee5-2.0.1-bin.zip"/>
6262

6363
</site>

‎features/org.apache.geronimo.feature/feature.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
219
<feature
320
id="org.apache.geronimo.feature"
421
label="Geronimo Core Feature"

‎features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</license>
3939

4040
<data
41-
id="geronimo-jetty6-jee5-2.0.zip"
41+
id="geronimo-jetty6-jee5-${org.apache.geronimo.installableruntime.jetty.feature_version}.zip"
4242
download-size="0"
4343
install-size="0"/>
4444

‎features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</license>
3939

4040
<data
41-
id="geronimo-tomcat6-jee5-2.0.zip"
41+
id="geronimo-tomcat6-jee5-${org.apache.geronimo.installableruntime.tomcat.feature_version}.zip"
4242
download-size="0"
4343
install-size="0"/>
4444

‎features/org.apache.geronimo.v10.feature/feature.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
219
<feature
320
id="org.apache.geronimo.v10.feature"
421
label="Geronimo v1.0 Server Adapter"

‎features/org.apache.geronimo.v11.feature/feature.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
219
<feature
320
id="org.apache.geronimo.v11.feature"
421
label="Geronimo v1.1.x Server Adapter"

‎features/org.apache.geronimo.v12.feature/feature.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
219
<feature
320
id="org.apache.geronimo.v12.feature"
421
label="Geronimo v1.2 Server Adapter"

‎features/org.apache.geronimo.v20.feature/feature.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
219
<feature
320
id="org.apache.geronimo.v20.feature"
421
label="Geronimo v2.0 Server Adapter"

‎plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ void updateInstallDir(IPath installPath) {
228228
InstallableRuntime installable = (InstallableRuntime) (tomcat.getSelection() ? gWithTomcat
229229
: gWithJetty);
230230
String version = installable.getFeatureVersion();
231-
if (version.endsWith(".0"))
232-
version = version.substring(0, version.lastIndexOf(".0"));
233-
installPath = installPath.append("geronimo-" + version);
231+
// if (version.endsWith(".0"))
232+
// version = version.substring(0, version.lastIndexOf(".0"));
233+
installPath = installPath.append("geronimo-" + (tomcat.getSelection() ? "tomcat6" : "jetty6") + "-jee5-" + version);
234234
installDir.setText(installPath.toOSString());
235235
}
236236
});

‎plugins/org.apache.geronimo.st.v20.core/plugin.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@
5050

5151
<extension point="org.eclipse.wst.server.core.installableRuntimes">
5252
<installableRuntime id="org.apache.geronimo.runtime.tomcat.20"
53-
featureVersion="2.0.0"
53+
featureVersion="2.0.1"
5454
featureId="org.apache.geronimo.installableruntime.tomcat.feature"
5555
featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
56-
path="geronimo-tomcat-j2ee-2.0.zip">
56+
path="geronimo-tomcat6-jee5-2.0.1.zip">
5757
</installableRuntime>
5858
<installableRuntime id="org.apache.geronimo.runtime.jetty.20"
59-
featureVersion="2.0.0"
59+
featureVersion="2.0.1"
6060
featureId="org.apache.geronimo.installableruntime.jetty.feature"
6161
featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
62-
path="geronimo-jetty-j2ee-2.0.zip">
62+
path="geronimo-jetty6-jee5-2.0.1.zip">
6363
</installableRuntime>
6464
</extension>
6565

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
<org.apache.geronimo.v11.feature_version>2.0.0</org.apache.geronimo.v11.feature_version>
9090
<org.apache.geronimo.v12.feature_version>2.0.0</org.apache.geronimo.v12.feature_version>
9191
<org.apache.geronimo.v20.feature_version>2.0.0</org.apache.geronimo.v20.feature_version>
92-
<org.apache.geronimo.installableruntime.tomcat.feature_version>2.0.0</org.apache.geronimo.installableruntime.tomcat.feature_version>
93-
<org.apache.geronimo.installableruntime.jetty.feature_version>2.0.0</org.apache.geronimo.installableruntime.jetty.feature_version>
92+
<org.apache.geronimo.installableruntime.tomcat.feature_version>2.0.1</org.apache.geronimo.installableruntime.tomcat.feature_version>
93+
<org.apache.geronimo.installableruntime.jetty.feature_version>2.0.1</org.apache.geronimo.installableruntime.jetty.feature_version>
9494
</properties>
9595

9696
<dependencyManagement>

0 commit comments

Comments
 (0)