You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/01/04 21:48:38 UTC
svn commit: r492731 - in /geronimo/server/trunk:
assemblies/geronimo-framework/src/main/var/config/
assemblies/geronimo-jetty6-jee5/src/main/var/config/
assemblies/geronimo-jetty6-minimal/src/main/var/config/
assemblies/geronimo-tomcat6-jee5/src/main/v...
Author: pmcmahan
Date: Thu Jan 4 12:48:37 2007
New Revision: 492731
URL: http://svn.apache.org/viewvc?view=rev&rev=492731
Log:
GERONIMO-2670 update assemblies to point at repository list for geronimo-2.0, plus update geronimo-plugin.xml files
to use ${version} instead of ${pom.currentVersion}
Modified:
geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml Thu Jan 4 12:48:37 2007
@@ -33,7 +33,7 @@
<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
</gbean>
<gbean name="DownloadedPluginRepos">
- <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-1.2.txt</attribute>
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
<attribute name="userRepositories">[]</attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Thu Jan 4 12:48:37 2007
@@ -35,7 +35,7 @@
<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
</gbean>
<gbean name="DownloadedPluginRepos">
- <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-1.2.txt</attribute>
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
<attribute name="userRepositories">[]</attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml Thu Jan 4 12:48:37 2007
@@ -33,7 +33,7 @@
<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
</gbean>
<gbean name="DownloadedPluginRepos">
- <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-1.2.txt</attribute>
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
<attribute name="userRepositories">[]</attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml Thu Jan 4 12:48:37 2007
@@ -35,7 +35,7 @@
<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
</gbean>
<gbean name="DownloadedPluginRepos">
- <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-1.2.txt</attribute>
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
<attribute name="userRepositories">[]</attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml Thu Jan 4 12:48:37 2007
@@ -33,7 +33,7 @@
<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
</gbean>
<gbean name="DownloadedPluginRepos">
- <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-1.2.txt</attribute>
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.0.txt</attribute>
<attribute name="userRepositories">[]</attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml Thu Jan 4 12:48:37 2007
@@ -20,7 +20,7 @@
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
<name>Geronimo CA Helper Web App (Jetty)</name>
- <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
<category>Core Geronimo</category>
<description>
This is a helper application for CA to enable receiving CSR's through
@@ -29,7 +29,7 @@
<url>http://geronimo.apache.org/</url>
<author>The Apache Geronimo development community</author>
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
- <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <geronimo-version>${version}</geronimo-version>
<prerequisite>
<id>org.apache.geronimo.configs/jetty//car</id>
<resource-type>Web Container</resource-type>
Modified: geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Jan 4 12:48:37 2007
@@ -20,7 +20,7 @@
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
<name>Geronimo CA Helper Web App (Tomcat)</name>
- <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
<category>Core Geronimo</category>
<description>
This is a helper application for CA to enable receiving CSR's through
@@ -29,7 +29,7 @@
<url>http://geronimo.apache.org/</url>
<author>The Apache Geronimo development community</author>
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
- <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <geronimo-version>${version}</geronimo-version>
<prerequisite>
<id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
Modified: geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml Thu Jan 4 12:48:37 2007
@@ -20,7 +20,7 @@
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
<name>Geronimo Dojo App (jetty)</name>
- <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
<category>Geronimo</category>
<description>
The Dojo AJAX library for Geronimo. This binds to /dojo so that
@@ -30,7 +30,7 @@
<url>http://dojotoolkit.org/</url>
<author>Dojo Foundation</author>
<license osi-approved="true">BSD and Academic Free License v2.1</license>
- <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <geronimo-version>${version}</geronimo-version>
<prerequisite>
<id>geronimo/jetty//car</id>
<resource-type>Web Container</resource-type>
Modified: geronimo/server/trunk/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml Thu Jan 4 12:48:37 2007
@@ -20,7 +20,7 @@
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
<name>Geronimo OpenJPA plugin</name>
- <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
<category>Geronimo</category>
<description>
OpenJPA plugin for geronimo. This provides OpenJPA together with its dependencies as one dependency.
@@ -28,7 +28,7 @@
<url>http://cwiki.apache.org/confluence/display/openjpa/Index</url>
<author>Apache Software Foundation</author>
<license osi-approved="true">ASL 2</license>
- <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <geronimo-version>${version}</geronimo-version>
<source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
<source-repository>http://www.ibiblio.org/maven2/</source-repository>
</geronimo-plugin>
Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=492731&r1=492730&r2=492731
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml Thu Jan 4 12:48:37 2007
@@ -20,7 +20,7 @@
<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
<name>Geronimo Admin Console (Jetty)</name>
- <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
<category>Core Geronimo</category>
<description>
The web-based administration console for Geronimo. You can
@@ -33,7 +33,7 @@
<url>http://geronimo.apache.org/</url>
<author>The Apache Geronimo development community</author>
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
- <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <geronimo-version>${version}</geronimo-version>
<prerequisite>
<id>geronimo/jetty//car</id>
<resource-type>Web Container</resource-type>