geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r545320 [1/2] - in /geronimo/server/trunk: applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/ configs/ca-helper-jett...
Date Thu, 07 Jun 2007 21:33:39 GMT
Author: dwoods
Date: Thu Jun  7 14:33:37 2007
New Revision: 545320

URL: http://svn.apache.org/viewvc?view=rev&rev=545320
Log:
GERONIMO-2757 Enhance plugin schema to allow for multiple versions of a plugin - Part 1.  Also updated geronimo-plugin.xml files for the configs to point to the 2.0 repo.

Added:
    geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/plugins-1.2.xsd   (with props)
Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
    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/directory/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/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/ldap-realm/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/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginMetadata.java
    geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/plugins-1.1.xsd
    geronimo/server/trunk/modules/geronimo-system/src/test/data/geronimo-plugins.xml
    geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java Thu Jun  7 14:33:37 2007
@@ -75,7 +75,35 @@
                 log.warn("Unable to edit plugin metadata containing more than one license!  Additional license data will not be editable.");
             }
         }
-        request.setAttribute("gerVersions", combine(data.getGeronimoVersions()));
+        //request.setAttribute("gerVersions", combine(data.getGeronimoVersions()));
+        PluginMetadata.geronimoVersions[] gerVers = data.getGeronimoVersions();
+        if(gerVers != null && gerVers.length > 0) {
+        	for (int i = 0; i < gerVers.length; i++) {
+        		PluginMetadata.geronimoVersions ver = gerVers[i];
+        		String prefix = "geronimo-versions" + (i+1);
+        		request.setAttribute(prefix +"Version", ver.getVersion());
+                if (ver.getModuleId() != null) {
+                    request.setAttribute(prefix +"ModuleID", ver.getModuleId().toString());
+                }
+                if (ver.getRepository() != null) {
+                    request.setAttribute(prefix +"Repo", ver.getRepository());
+                }
+                PluginMetadata.Prerequisite[] reqs = ver.getPrerequisite();
+                if(reqs != null && reqs.length > 0) {
+                    for (int j = 0; i < reqs.length; i++) {
+                        PluginMetadata.Prerequisite req = reqs[i];
+                        String prefixes = "prereq" + (i+1);
+                        request.setAttribute(prefixes, req.getModuleId().toString());
+                        if (req.getResourceType() != null) {
+                            request.setAttribute(prefixes +"type", req.getResourceType());
+                        }
+                        if (req.getDescription() != null) {
+                            request.setAttribute(prefixes +"desc", req.getDescription());
+                        }
+                    }
+                }
+        	}
+        }
         request.setAttribute("jvmVersions", combine(data.getJvmVersions()));
         request.setAttribute("dependencies", combine(data.getDependencies()));
         request.setAttribute("obsoletes", combine(data.getObsoletes()));
@@ -104,7 +132,6 @@
         String description = request.getParameter("description");
         String license = request.getParameter("license");
         String osi = request.getParameter("licenseOSI");
-        String gers = request.getParameter("gerVersions");
         String jvms = request.getParameter("jvmVersions");
         String deps = request.getParameter("dependencies");
         String obsoletes = request.getParameter("obsoletes");
@@ -112,7 +139,6 @@
         PluginMetadata metadata = new PluginMetadata(name, data.getModuleId(),
                 category, description, url, author, null, true, false);
         metadata.setDependencies(split(deps));
-        metadata.setGeronimoVersions(split(gers));
         metadata.setJvmVersions(split(jvms));
         metadata.setObsoletes(split(obsoletes));
         List licenses = new ArrayList();
@@ -123,8 +149,42 @@
             licenses.add(data.getLicenses()[i]);
         }
         metadata.setLicenses((PluginMetadata.License[]) licenses.toArray(new PluginMetadata.License[licenses.size()]));
-        List prereqs = new ArrayList();
+        List gerVersions = new ArrayList();
         int counter = 1;
+        while(true) {
+        	String prefix = "geronimo-versions" + counter;
+        	++counter;
+        	String id = request.getParameter(prefix);
+        	if (id == null || id.trim() == "") {
+        		break;
+        	}
+        	String version = request.getParameter(prefix+"Version");
+        	String moduleId = request.getParameter(prefix+"ModuleID");
+        	String repository = request.getParameter(prefix+"Repo");
+        	int preCounter = 1;
+        	List prereqs = new ArrayList();
+            while(true) {
+                String prefixes = "prereq" + preCounter;
+                ++counter;
+                String prereq = request.getParameter(prefixes);
+                if(prereq == null || prereq.trim().equals("")) {
+                    break;
+                }
+                String type = request.getParameter(prefixes+"type");
+                String desc = request.getParameter(prefixes+"desc");
+                if(type != null && type.trim().equals("")) {
+                    type = null;
+                }
+                if(desc != null && desc.trim().equals("")) {
+                    desc = null;
+                }
+                prereqs.add(new PluginMetadata.Prerequisite(Artifact.create(id), false, type, desc));
+            }
+            gerVersions.add(new PluginMetadata.geronimoVersions(version, moduleId, repository, (PluginMetadata.Prerequisite[])prereqs.toArray(new PluginMetadata.Prerequisite[prereqs.size()])));      	
+        }
+        metadata.setGeronimoVersions((PluginMetadata.geronimoVersions[])gerVersions.toArray(new PluginMetadata.geronimoVersions[gerVersions.size()]));
+        List prereqs = new ArrayList();
+        counter = 1;
         while(true) {
             String prefix = "prereq" + counter;
             ++counter;

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java Thu Jun  7 14:33:37 2007
@@ -233,14 +233,14 @@
                     config.appendChild(lic);
                 }
                 // Skip hash since the CAR will be re-exported anyway and the file will be different
-                String[] versions = data.getGeronimoVersions();
+                PluginMetadata.geronimoVersions[] versions = data.getGeronimoVersions();
                 for (int k = 0; k < versions.length; k++) {
-                    String ver = versions[k];
-                    createText(doc, config, "geronimo-version", ver);
+                    PluginMetadata.geronimoVersions ver = versions[k];
+                    writeGeronimoVersion(doc, config, ver);
                 }
-                versions = data.getJvmVersions();
+                String[] jvmVersions = data.getJvmVersions();
                 for (int k = 0; k < versions.length; k++) {
-                    String ver = versions[k];
+                    String ver = jvmVersions[k];
                     createText(doc, config, "jvm-version", ver);
                 }
                 for (int k = 0; k < data.getPrerequisites().length; k++) {
@@ -313,6 +313,28 @@
         createText(doc, prereq, "id", req.getModuleId().toString());
         createText(doc, prereq, "resource-type", req.getResourceType());
         createText(doc, prereq, "description", req.getDescription());
+    }
+    
+    private void writeGeronimoVersion(Document doc, Element config, PluginMetadata.geronimoVersions ver){
+    	Element ger = doc.createElement("geronimo-versions");
+        createText(doc, ger, "version", ver.getVersion());
+        if (ver.getModuleId() != null){
+        	createText(doc, ger, "module-id", ver.getModuleId());
+        }
+        if (ver.getPrerequisite() != null){
+            for (int j = 0; j < ver.getPrerequisite().length; j++) {
+                PluginMetadata.Prerequisite prereq = ver.getPrerequisite()[j];
+                Element pre = doc.createElement("prerequisite");
+                createText(doc, pre, "id", prereq.getModuleId().toString());
+                if(prereq.getResourceType() != null) {
+                    createText(doc, pre, "resource-type", prereq.getResourceType());
+                }
+                if(prereq.getDescription() != null) {
+                    createText(doc, pre, "description", prereq.getDescription());
+                }
+                ger.appendChild(pre);
+            }
+        }
     }
 
     private void createText(Document doc, Element parent, String name, String text) {

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp Thu Jun  7 14:33:37 2007
@@ -59,12 +59,22 @@
         </td>
       </tr>
   </c:forEach>
-  <tr>
-    <th align="right" valign="top">Ger&nbsp;Versions:</th>
+    <tr>
+    <th align="right" valign="top">Geronimo-Versions:</th>
     <td>
-      ${fn:join(plugin.geronimoVersions, ", ")}
+      <c:choose>
+        <c:when test="${empty plugin.geronimoVersions}">
+          <i>None</i>
+        </c:when>
+        <c:otherwise>
+          <c:forEach var="gerVersions" items="${plugin.geronimoVersions}">
+            <b>${gerVersions.version}</b>
+          </c:forEach>
+        </c:otherwise>
+      </c:choose>
     </td>
   </tr>
+  <tr>
   <tr>
     <th align="right" valign="top">JVM Versions:</th>
     <td>

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=545320&r1=545319&r2=545320
==============================================================================
--- 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 Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo CA Helper Web App (Jetty)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -29,7 +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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <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=545320&r1=545319&r2=545320
==============================================================================
--- 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 Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo CA Helper Web App (Tomcat)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -29,7 +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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Apache Directory 0.92 for Geronimo</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Security</category>
@@ -40,11 +40,12 @@
     <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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version> 
+    </geronimo-versions>
     <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://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
+    <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
     <config-xml-content>
         <gbean xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1"

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=545320&r1=545319&r2=545320
==============================================================================
--- 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 Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo Dojo App (jetty)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Geronimo</category>
@@ -30,7 +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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>geronimo/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo Dojo App (Tomcat)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Geronimo</category>
@@ -30,7 +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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>
@@ -42,6 +44,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/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Jakarta JSP Examples (Jetty)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
@@ -30,7 +30,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>
@@ -43,7 +45,6 @@
     </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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Jakarta JSP Examples (Tomcat)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
@@ -30,7 +30,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>
@@ -42,7 +44,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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>LDAP Example Web App (Jetty)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
@@ -32,8 +32,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>${version}</geronimo-version>
-    <prerequisite>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>    <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>
         <description>
@@ -45,7 +46,6 @@
     </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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>LDAP Example Web App (Tomcat)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
@@ -32,8 +32,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>${version}</geronimo-version>
-    <prerequisite>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>    <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>
         <description>
@@ -45,7 +46,6 @@
     </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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>LDAP Example Security Realm</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
@@ -32,10 +32,11 @@
     <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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <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://www.geronimoplugins.com/repository/geronimo-1.1/</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/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=545320&r1=545319&r2=545320
==============================================================================
--- 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 Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo OpenJPA plugin</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Geronimo</category>
@@ -28,7 +28,9 @@
     <url>http://cwiki.apache.org/confluence/display/openjpa/Index</url>
     <author>Apache Software Foundation</author>
     <license osi-approved="true">ASL 2</license>
-    <geronimo-version>${version}</geronimo-version>
-    <source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
+    <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/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Jakarta Servlet Examples (Jetty)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
@@ -30,7 +30,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>
@@ -42,7 +44,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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Jakarta Servlet Examples (Tomcat)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
@@ -30,7 +30,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>
@@ -42,7 +44,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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Tomcat Deployer</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -24,7 +24,9 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>
@@ -35,7 +37,6 @@
     <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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Tomcat Web Server</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -24,13 +24,14 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
     <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://www.geronimoplugins.com/repository/geronimo-1.1/</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/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=545320&r1=545319&r2=545320
==============================================================================
--- 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 Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo Admin Console (Jetty)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -33,7 +33,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>geronimo/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo Admin Console (Tomcat)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -33,7 +33,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>
@@ -45,27 +47,31 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
-    <dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
-    <dependency>portlet-api/portlet-api/1.0/jar</dependency>
-    <dependency>org.apache.pluto/pluto/1.0.1/jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-console-core//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-management//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-test-ddbean//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-deploy-jsr88//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-deploy-config//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-service-builder//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-connector-builder//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-naming-builder//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-security-builder//jar</dependency>
-    <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema//jar</dependency>
-    <dependency>xmlbeans/xbean/2.0.0/jar</dependency>
-    <dependency>stax/stax-api/1.0/jar</dependency>
-    <dependency>activemq/activemq-gbean-management/3.2.4-SNAPSHOT/jar</dependency>
-    <dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
-    <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
+    <dependency>org.apache.geronimo.configs/system-database//car</dependency>
+    <dependency>org.apache.geronimo.configs/jasper//car</dependency>
+    <dependency>org.apache.geronimo.configs/jasper-deployer//car</dependency>
+    <dependency>org.apache.geronimo.configs/dojo-tomcat//car</dependency>
+    <dependency>org.apache.geronimo.configs/tomcat-deployer//car</dependency>
+    <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
+    <dependency>org.apache.geronimo.configs/j2ee-corba-yoko//car</dependency>
+    <dependency>org.apache.geronimo.applications.console/geronimo-console-core//jar</dependency>
+    <dependency>org.apache.geronimo.applications.console/geronimo-console//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://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
+    <dependency>org.apache.geronimo.modules/geronimo-deploy-jsr88//jar</dependency>
+    <dependency>org.apache.geronimo.modules/geronimo-management//jar</dependency>
+    <dependency>org.apache.geronimo.modules/geronimo-upgrade//jar</dependency>
+    <dependency>org.apache.geronimo.modules/geronimo-activemq//jar</dependency>
+    <dependency>org.apache.geronimo.modules/geronimo-activemq-management//jar</dependency>
+    <dependency>jdom/jdom/1.0/jar</dependency>
+    <dependency>org.apache.pluto/pluto/1.0.1/jar</dependency>
+    <dependency>portlet-api/portlet-api/1.0/jar</dependency>
+    <dependency>org.apache.pluto/pluto-portal/1.0.1/jar</dependency>
+    <dependency>org.apache.pluto/pluto-descriptors/1.0.1/jar</dependency>
+    <dependency>org.codehaus.castor/castor/1.0.5/jar</dependency>
+    <dependency>commons-digester/commons-digester/1.8/jar</dependency>
+    <dependency>commons-fileupload/commons-fileupload/1.1.1/jar</dependency>
+    <dependency>commons-io/commons-io/1.1/jar</dependency>
+    <dependency>dwr/dwr/1.1.3/jar</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/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo Welcome Web App (Jetty)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -32,7 +32,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>
@@ -44,7 +46,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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Jun  7 14:33:37 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo Welcome Web App (Tomcat)</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
@@ -32,7 +32,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>${version}</geronimo-version>
+    <geronimo-versions>
+    	<version>${version}</version>
+    </geronimo-versions>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
         <resource-type>Web Container</resource-type>
@@ -44,7 +46,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://www.geronimoplugins.com/repository/geronimo-1.1/</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/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Thu Jun  7 14:33:37 2007
@@ -348,7 +348,7 @@
      *                 Set this to null if no authentication is required.
      */
     public PluginList listPlugins(URL mavenRepository, String username, String password) throws IOException, FailedLoginException {
-        String repository = mavenRepository.toString();
+        String repository = mavenRepository.toString().trim();
         if(!repository.endsWith("/")) {
             repository = repository+"/";
         }
@@ -897,10 +897,10 @@
      */
     private static URL getURL(Artifact configId, URL repository) throws MalformedURLException {
 	URL context;
-	if(repository.toString().endsWith("/")) {
+	if(repository.toString().trim().endsWith("/")) {
 	    context = repository;
 	} else {
-	    context = new URL(repository.toString()+"/");
+	    context = new URL(repository.toString().trim()+"/");
 	}
 
 	String qualifiedVersion = configId.getVersion().toString();
@@ -1074,7 +1074,7 @@
         monitor.getResults().setCurrentMessage("Searching for "+query+" at "+url);
         String base = query.getGroupId().replace('.', '/') + "/" + query.getArtifactId();
         String path = base +"/maven-metadata.xml";
-        URL metaURL = new URL(url.toString().endsWith("/") ? url : new URL(url.toString()+"/"), path);
+        URL metaURL = new URL(url.toString().trim().endsWith("/") ? url : new URL(url.toString().trim()+"/"), path);
         InputStream in = connect(metaURL, username, password, monitor);
         if(in == null) {
             return null;
@@ -1201,7 +1201,7 @@
                 null, // hash
                 true, // installed
                 false);
-        meta.setGeronimoVersions(new String[]{serverInfo.getVersion()});
+        meta.setGeronimoVersions(new PluginMetadata.geronimoVersions[]{new PluginMetadata.geronimoVersions(serverInfo.getVersion(), null, null, null)});
         meta.setJvmVersions(new String[0]);
         meta.setLicenses(new PluginMetadata.License[0]);
         meta.setObsoletes(new String[]{new Artifact(data.getId().getGroupId(), data.getId().getArtifactId(), (Version)null, data.getId().getType()).toString()});
@@ -1279,10 +1279,10 @@
         String[] repos = getChildrenText(root, "default-repository");
         URL[] repoURLs = new URL[repos.length];
         for(int i = 0; i < repos.length; i++) {
-            if(repos[i].endsWith("/")) {
-                repoURLs[i] = new URL(repos[i]);
+            if(repos[i].trim().endsWith("/")) {
+                repoURLs[i] = new URL(repos[i].trim());
             } else {
-                repoURLs[i] = new URL(repos[i]+"/");
+                repoURLs[i] = new URL(repos[i].trim()+"/");
             }
         }
 
@@ -1305,6 +1305,7 @@
                              new InputStream[]{
                                      PluginInstallerGBean.class.getResourceAsStream("/META-INF/schema/attributes-1.1.xsd"),
                                      PluginInstallerGBean.class.getResourceAsStream("/META-INF/schema/plugins-1.1.xsd"),
+                                     PluginInstallerGBean.class.getResourceAsStream("/META-INF/schema/plugins-1.2.xsd")
                              }
         );
         DocumentBuilder builder = factory.newDocumentBuilder();
@@ -1385,10 +1386,57 @@
                 eligible = false;
             }
         }
-        String[] gerVersions = getChildrenText(plugin, "geronimo-version");
-        if(gerVersions.length > 0) {
-            boolean match = checkGeronimoVersions(gerVersions);
-            if(!match) eligible = false;
+        PluginMetadata.geronimoVersions[] gerVersions = null;
+        //  Process the old geronimo-version element.  Each needs to be converted to a new geronimo version element.
+        String[] gerVersion = getChildrenText(plugin, "geronimo-version");
+        if(gerVersion.length > 0) {
+            boolean match = checkGeronimoVersions(gerVersion);
+            if(!match) {
+            	eligible = false;
+            }
+            	gerVersions = new PluginMetadata.geronimoVersions[gerVersion.length];
+            	for(int i=0; i < gerVersion.length; i++) {
+            		gerVersions[i] = new PluginMetadata.geronimoVersions(gerVersion[i], null, null, null);
+            	}
+        }
+        //Process the new geronimo version elements.
+        NodeList gerNodes = plugin.getElementsByTagName("geronimo-versions");
+        if (gerNodes.getLength() > 0) {
+        	gerVersions = new PluginMetadata.geronimoVersions[gerNodes.getLength()];
+        	for ( int i = 0; i < gerNodes.getLength(); i++ ) {
+        		Element node = (Element) gerNodes.item(i);
+        		String version = getChildText(node, "version");
+        		if (version == null) {
+        			throw new SAXException("geronimo-versions requires <version> ");
+        		}
+        		String moduleID = getChildText(node, "module-id");
+        		String sourceRepo = getChildText(node, "source-repository");
+        		
+        		//Process the prerequisite elements
+                NodeList preReqNode = node.getElementsByTagName("prerequisite");
+                PluginMetadata.Prerequisite[] preReqs = new PluginMetadata.Prerequisite[preReqNode.getLength()];
+                for(int j=0; j < preReqNode.getLength(); j++) {
+                    Element preNode = (Element) preReqNode.item(j);
+                    String originalConfigId = getChildText(preNode, "id");
+                    if(originalConfigId == null) {
+                        throw new SAXException("Prerequisite requires <id>");
+                    }
+                    Artifact artifact = Artifact.create(originalConfigId.replaceAll("\\*", ""));
+                    boolean present = resolver.queryArtifacts(artifact).length > 0;
+                    preReqs[j] = new PluginMetadata.Prerequisite(artifact, present,
+                            getChildText(node, "resource-type"), getChildText(preNode, "description"));
+                    if(!present) {
+                        log.debug(moduleId+" is not eligible due to missing "+prereqs[j].getModuleId());
+                        eligible = false;
+                    }
+                }
+                gerVersions[i] = new PluginMetadata.geronimoVersions(version, moduleID, sourceRepo, preReqs);
+                
+        	}
+        	boolean match = checkGeronimoVersions(gerVersions);
+        	if (!match){
+        		eligible = false;
+        	}
         }
         String[] jvmVersions = getChildrenText(plugin, "jvm-version");
         if(jvmVersions.length > 0) {
@@ -1398,7 +1446,7 @@
         String[] repoNames = getChildrenText(plugin, "source-repository");
         URL[] repos = new URL[repoNames.length];
         for (int i = 0; i < repos.length; i++) {
-            repos[i] = new URL(repoNames[i]);
+            repos[i] = new URL(repoNames[i].trim());
         }
         Artifact artifact = null;
         boolean installed = false;
@@ -1444,7 +1492,7 @@
      * environment.
      *
      * @return true if the specified versions match the current
-     *              execution environment as defined by plugins-1.1.xsd
+     *              execution environment as defined by plugins-1.2.xsd
      */
     private boolean checkJVMVersions(String[] jvmVersions) {
         if(jvmVersions.length == 0) return true;
@@ -1468,24 +1516,68 @@
      * environment.
      *
      * @return true if the specified versions match the current
-     *              execution environment as defined by plugins-1.1.xsd
+     *              execution environment as defined by plugins-1.2.xsd
      */
-    private boolean checkGeronimoVersions(String[] gerVersions) {
-        if(gerVersions.length == 0) return true;
-        String version = serverInfo.getVersion();
+    private boolean checkGeronimoVersions(PluginMetadata.geronimoVersions[] gerVersions) throws IllegalStateException {
+    	if ((gerVersions == null) || (gerVersions.length == 0)) {
+            return true;
+        }
+
         boolean match = false;
         for (int j = 0; j < gerVersions.length; j++) {
-            String gerVersion = gerVersions[j];
-            if(gerVersion == null || gerVersion.equals("")) {
-                throw new IllegalStateException("geronimo-version should not be empty!");
+            PluginMetadata.geronimoVersions gerVersion = gerVersions[j];
+            if(gerVersion == null) {
+            	throw new IllegalStateException("Geronimo version cannot be null");
             }
-            if(gerVersion.equals(version)) {
-                match = true;
+
+            match = checkGeronimoVersion(gerVersion.getVersion());
+            if (match) {
                 break;
             }
         }
         return match;
     }
+    
+    /**
+     * Check whether the specified Geronimo versions match the current runtime
+     * environment.
+     *
+     * @return true if the specified versions match the current
+     *              execution environment as defined by plugins-1.2.xsd
+     */
+    private boolean checkGeronimoVersions(String[] gerVersions) throws IllegalStateException {
+    	if ((gerVersions == null) || (gerVersions.length == 0)) {
+            return true;
+        }
+
+    	boolean match = false;
+    	for ( int j = 0; j < gerVersions.length; j++ ) {
+            match = checkGeronimoVersion(gerVersions[j]);
+            if (match) {
+                break;
+            }
+    	}
+    	return match;
+    }
+
+    /**
+     * Check whether the specified Geronimo version matches the current runtime
+     * environment.
+     *
+     * @return true if the specified version matches the current
+     *              execution environment as defined by plugins-1.2.xsd
+     */
+    private boolean checkGeronimoVersion(String gerVersion) throws IllegalStateException {
+        String version = serverInfo.getVersion();
+
+        if ((gerVersion == null) || gerVersion.equals("")) {
+    	    throw new IllegalStateException("geronimo-version cannot be empty!");
+        } else if (gerVersion.equals(version)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
     /**
      * Gets the text out of a child of the specified DOM element.
@@ -1579,8 +1671,8 @@
                     continue;
                 }
             }
-            if(!deps.contains(dep.getArtifact().toString())) {
-                deps.add(dep.getArtifact().toString());
+            if(!deps.contains(dep.getArtifact().toString().trim())) {
+                deps.add(dep.getArtifact().toString().trim());
             }
         }
         return prereq;
@@ -1592,8 +1684,8 @@
     private static Document writePluginMetadata(PluginMetadata data) throws ParserConfigurationException {
         DocumentBuilder builder = createDocumentBuilder();
         Document doc = builder.newDocument();
-        Element config = doc.createElementNS("http://geronimo.apache.org/xml/ns/plugins-1.1", "geronimo-plugin");
-        config.setAttribute("xmlns", "http://geronimo.apache.org/xml/ns/plugins-1.1");
+        Element config = doc.createElementNS("http://geronimo.apache.org/xml/ns/plugins-1.2", "geronimo-plugin");
+        config.setAttribute("xmlns", "http://geronimo.apache.org/xml/ns/plugins-1.2");
         doc.appendChild(config);
 
         addTextChild(doc, config, "name", data.getName());
@@ -1620,7 +1712,30 @@
             config.appendChild(hash);
         }
         for (int i = 0; i < data.getGeronimoVersions().length; i++) {
-            addTextChild(doc, config, "geronimo-version", data.getGeronimoVersions()[i]);
+        	PluginMetadata.geronimoVersions gerVersions = data.getGeronimoVersions()[i];
+        	Element ger = doc.createElement("geronimo-versions");
+            addTextChild(doc, ger, "version", gerVersions.getVersion());
+            if (gerVersions.getModuleId() != null){
+            	addTextChild(doc, ger, "module-id", gerVersions.getModuleId());
+            }
+            if (gerVersions.getPrerequisite() != null){
+                for (int j = 0; j < gerVersions.getPrerequisite().length; j++) {
+                    PluginMetadata.Prerequisite prereq = gerVersions.getPrerequisite()[j];
+                    Element pre = doc.createElement("prerequisite");
+                    addTextChild(doc, pre, "id", prereq.getModuleId().toString());
+                    if(prereq.getResourceType() != null) {
+                        addTextChild(doc, pre, "resource-type", prereq.getResourceType());
+                    }
+                    if(prereq.getDescription() != null) {
+                        addTextChild(doc, pre, "description", prereq.getDescription());
+                    }
+                    ger.appendChild(pre);
+                }
+            }
+            if (gerVersions.getRepository() != null) {
+            	addTextChild(doc, ger, "repository", gerVersions.getRepository());
+            }
+            config.appendChild(ger);
         }
         for (int i = 0; i < data.getJvmVersions().length; i++) {
             addTextChild(doc, config, "jvm-version", data.getJvmVersions()[i]);
@@ -1645,7 +1760,7 @@
         }
         for (int i = 0; i < data.getRepositories().length; i++) {
             URL url = data.getRepositories()[i];
-            addTextChild(doc, config, "source-repository", url.toString());
+            addTextChild(doc, config, "source-repository", url.toString().trim());
         }
         for (int i = 0; i < data.getFilesToCopy().length; i++) {
             PluginMetadata.CopyFile file = data.getFilesToCopy()[i];

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginMetadata.java?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginMetadata.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginMetadata.java Thu Jun  7 14:33:37 2007
@@ -38,7 +38,7 @@
     private final String author;
     private License[] licenses = new License[0];
     private final Hash hash;
-    private String[] geronimoVersions = new String[0];
+    private geronimoVersions[] geronimoVersions = new geronimoVersions[0];
     private String[] jvmVersions = new String[0];
     private Prerequisite[] prerequisites = new Prerequisite[0];
     private String[] dependencies = new String[0];
@@ -154,7 +154,7 @@
         return forceStart;
     }
 
-    public String[] getGeronimoVersions() {
+    public geronimoVersions[] getGeronimoVersions() {
         return geronimoVersions;
     }
 
@@ -174,7 +174,7 @@
         return repositories;
     }
 
-    public void setGeronimoVersions(String[] geronimoVersions) {
+    public void setGeronimoVersions(geronimoVersions[] geronimoVersions) {
         this.geronimoVersions = geronimoVersions;
     }
 
@@ -412,5 +412,40 @@
             list.add(desc.substring(last).trim());
         }
         return (String[]) list.toArray(new String[list.size()]);
+    }
+
+    public static class geronimoVersions implements Serializable {
+    	
+    	private String version;
+    	private String moduleId;
+    	private String repository;
+    	private Prerequisite[] preReqs;
+    	
+    	public geronimoVersions( String version, String moduleId, String repository, Prerequisite[] preReqs) {
+    			this.version = version;
+    			this.moduleId = moduleId;
+    			this.repository = repository;
+    			this.preReqs = preReqs;
+    	}
+    	
+    	public String getVersion() {
+    		return version;
+    	}
+    	
+    	public void setVersion(String ver) {
+    		version = ver;
+    	}
+    	
+    	public String getModuleId() {
+    		return moduleId;
+    	}
+    	
+    	public String getRepository() {
+    		return repository;
+    	}
+    	
+    	public Prerequisite[] getPrerequisite() {
+    		return preReqs;
+    	}
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/plugins-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/plugins-1.1.xsd?view=diff&rev=545320&r1=545319&r2=545320
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/plugins-1.1.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/resources/META-INF/schema/plugins-1.1.xsd Thu Jun  7 14:33:37 2007
@@ -28,14 +28,14 @@
             available at some external site (e.g., a Maven 2 repository). All
             the Geronimo plugin list document must specify the top level element
             as geronimo-plugin-list with namespace specified as
-            xmlns="http://geronimo.apache.org/xml/ns/j2ee/plugins-1.2". The
+            xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1". The
             default location for this document is
-            http://geronimo.apache.org/schemas-1.2/plugins-1.2.xsd
+            http://geronimo.apache.org/schemas-1.1/plugins-1.1.xsd
         </xs:documentation>
     </xs:annotation>
 
     <xs:import namespace="http://geronimo.apache.org/xml/ns/attributes-1.1"
-        schemaLocation="attributes-1.1.xsd" />
+        schemaLocation="local-attributes-1.1.xsd" />
 
     <xs:annotation>
         <xs:documentation>



Mime
View raw message