geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r488115 - in /geronimo/server/branches/2.0-M1: 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/...
Date Mon, 18 Dec 2006 03:59:48 GMT
Author: pmcmahan
Date: Sun Dec 17 19:59:46 2006
New Revision: 488115

URL: http://svn.apache.org/viewvc?view=rev&rev=488115
Log:
GERONIMO-2670 update reference to repository list in assemblies and update plugin metadata
files for new geronimo version.  also update usage of ${pom.currentVersion} to ${version}

Modified:
    geronimo/server/branches/2.0-M1/assemblies/geronimo-framework/src/main/var/config/config.xml
    geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
    geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
    geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
    geronimo/server/branches/2.0-M1/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.0-M1/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml

Modified: geronimo/server/branches/2.0-M1/assemblies/geronimo-framework/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/assemblies/geronimo-framework/src/main/var/config/config.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/assemblies/geronimo-framework/src/main/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0-M1/assemblies/geronimo-framework/src/main/var/config/config.xml
Sun Dec 17 19:59:46 2006
@@ -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/branches/2.0-M1/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
Sun Dec 17 19:59:46 2006
@@ -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/branches/2.0-M1/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0-M1/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
Sun Dec 17 19:59:46 2006
@@ -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/branches/2.0-M1/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
Sun Dec 17 19:59:46 2006
@@ -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/branches/2.0-M1/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
(original)
+++ geronimo/server/branches/2.0-M1/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
Sun Dec 17 19:59:46 2006
@@ -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/branches/2.0-M1/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/ca-helper-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -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,9 +29,9 @@
     <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>
+        <id>org.apache.geronimo.configs/jetty6//car</id>
         <resource-type>Web Container</resource-type>
         <description>
             This version of the CA Helper application works with the Geronimo/Jetty distribution.
@@ -41,6 +41,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -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>
@@ -41,6 +41,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -43,7 +43,7 @@
     <geronimo-version>${version}</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-directory//jar</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
     <config-xml-content>

Modified: geronimo/server/branches/2.0-M1/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -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,9 +30,9 @@
     <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>
+        <id>geronimo/jetty6//car</id>
         <resource-type>Web Container</resource-type>
         <description>
             This version of the Welcome application works with the Geronimo/Jetty distribution.
@@ -42,5 +42,6 @@
         </description>
     </prerequisite>
     <dependency>geronimo/j2ee-server//car</dependency>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -42,6 +42,6 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -32,7 +32,7 @@
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
     <geronimo-version>${version}</geronimo-version>
     <prerequisite>
-        <id>org.apache.geronimo.configs/jetty//car</id>
+        <id>org.apache.geronimo.configs/jetty6//car</id>
         <resource-type>Web Container</resource-type>
         <description>
             This version of the JSP Examples works with the Geronimo/Jetty distribution.
@@ -43,7 +43,7 @@
     </prerequisite>
     <dependency>commons-collections/commons-collections/3.1/jar</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -42,7 +42,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -45,7 +45,7 @@
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/ldap-realm//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -45,7 +45,7 @@
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/ldap-realm//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -35,7 +35,7 @@
     <geronimo-version>${version}</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/directory//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -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>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <geronimo-version>${version}</geronimo-version>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -32,7 +32,7 @@
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
     <geronimo-version>${version}</geronimo-version>
     <prerequisite>
-        <id>org.apache.geronimo.configs/jetty//car</id>
+        <id>org.apache.geronimo.configs/jetty6//car</id>
         <resource-type>Web Container</resource-type>
         <description>
             This version of the Servlet Examples works with the Geronimo/Jetty distribution.
@@ -42,7 +42,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -42,7 +42,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -35,7 +35,7 @@
     <dependency>org.apache.geronimo.configs/tomcat6//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-tomcat6-builder//jar</dependency>
     <obsoletes>org.apache.geronimo.configs/tomcat6-deployer//car</obsoletes>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -30,7 +30,7 @@
     <dependency>org.apache.geronimo.configs/transaction//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-tomcat6//jar</dependency>
     <obsoletes>org.apache.geronimo.configs/tomcat6//car</obsoletes>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -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>
@@ -65,6 +65,7 @@
     <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
     <dependency>geronimo/geronimo-converter//jar</dependency>
     <dependency>geronimo/geronimo-util//jar</dependency>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -65,7 +65,7 @@
     <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-converter//jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-util//jar</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -34,7 +34,7 @@
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
     <geronimo-version>${version}</geronimo-version>
     <prerequisite>
-        <id>org.apache.geronimo.configs/jetty//car</id>
+        <id>org.apache.geronimo.configs/jetty6//car</id>
         <resource-type>Web Container</resource-type>
         <description>
             This version of the Welcome application works with the Geronimo/Jetty distribution.
@@ -44,7 +44,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/server/branches/2.0-M1/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=488115&r1=488114&r2=488115
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.0-M1/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Sun Dec 17 19:59:46 2006
@@ -44,7 +44,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>



Mime
View raw message