geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r399534 [1/4] - in /geronimo/branches/1.1: applications/console-standard/src/java/org/apache/geronimo/console/car/ applications/console-standard/src/webapp/WEB-INF/view/car/ configs/console-jetty/src/conf/ configs/console-tomcat/src/conf/ c...
Date Thu, 04 May 2006 04:09:23 GMT
Author: ammulder
Date: Wed May  3 21:09:17 2006
New Revision: 399534

URL: http://svn.apache.org/viewcvs?rev=399534&view=rev
Log:
Big update to plugin installer
 - repackage to make it clearer
 - give the schema a proper name and include it in the JAR
 - validate downloads against the schema
 - update the schema to support a central list of plugins that are
   individually hosted at different locations
   - each plugin may provide its own preferred repositories which
     override the default repositories
   - even the current repository must be listed in the defaults
 - support hashes in the plugin config file to validate plugin downloads
 - more agressive validation of downloaded plugins
 - add a GBean that maintains a list of plugin repositories
   - default implementation that downloads a list from Apache
   - maintains user-added repositories even when refreshing download list
   - command-line hooks in to give a pick list of repositories
 - start with no repositories defined, must download initial list
 - update plugin generator to produce new format with hashes
 - update Geronimo as Maven repo to produce new format

Added:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/UpdateListHandler.java   (with props)
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/DownloadPoller.java
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/DownloadPoller.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/DownloadResults.java
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/DownloadResults.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstaller.java
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationInstaller.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigInstallerGBean.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginList.java
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationList.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginMetadata.java
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationMetadata.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java   (with props)
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginRepositoryList.java   (with props)
    geronimo/branches/1.1/modules/system/src/schema/plugins-1.1.xsd
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/schema/config-list.xsd
    geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/plugin/
    geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
      - copied, changed from r399072, geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigInstallerTest.java
Removed:
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigInstallerGBean.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationArchiveData.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationInstaller.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationList.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationMetadata.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/DownloadPoller.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/DownloadResults.java
    geronimo/branches/1.1/modules/system/src/schema/config-list.xsd
    geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigInstallerTest.java
Modified:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadCARHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadStatusHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/IndexHandler.java
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/index.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/list.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/pluginParams.jsp
    geronimo/branches/1.1/configs/console-jetty/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/console-tomcat/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/directory/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml
    geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml
    geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java
    geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java
    geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
    geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
    geronimo/branches/1.1/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/repository/FileWriteMonitor.java
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/J2EEServer.java
    geronimo/branches/1.1/modules/system/maven.xml
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java
    geronimo/branches/1.1/modules/system/src/test-data/geronimo-plugins.xml

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/BaseImportExportHandler.java Wed May  3 21:09:17 2006
@@ -33,6 +33,7 @@
     protected static final String RESULTS_MODE = "results";
     protected static final String CONFIGURE_EXPORT_MODE = "configure";
     protected static final String CONFIRM_EXPORT_MODE = "confirm";
+    protected static final String UPDATE_REPOS_MODE = "updateList";
 
     protected BaseImportExportHandler(String mode, String viewName) {
         super(mode, viewName);

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadCARHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadCARHandler.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadCARHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadCARHandler.java Wed May  3 21:09:17 2006
@@ -17,10 +17,7 @@
 package org.apache.geronimo.console.car;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
@@ -32,14 +29,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.ajax.ProgressInfo;
-import org.apache.geronimo.console.ajax.ProgressMonitor;
 import org.apache.geronimo.console.util.PortletManager;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.MissingDependencyException;
-import org.apache.geronimo.system.configuration.ConfigurationInstaller;
-import org.apache.geronimo.system.configuration.ConfigurationMetadata;
-import org.apache.geronimo.system.configuration.DownloadResults;
-import org.apache.geronimo.system.configuration.ConfigurationList;
+import org.apache.geronimo.system.plugin.PluginList;
+import org.apache.geronimo.system.plugin.PluginMetadata;
+import org.apache.geronimo.system.plugin.PluginInstaller;
+import org.apache.geronimo.system.plugin.DownloadResults;
 
 /**
  * Handler for the initial download screen.
@@ -71,16 +66,16 @@
         String repo = request.getParameter("repository");
         String user = request.getParameter("repo-user");
         String pass = request.getParameter("repo-pass");
-        ConfigurationMetadata config = null;
+        PluginMetadata config = null;
         try {
-            ConfigurationList list = (ConfigurationList) request.getPortletSession(true).getAttribute(CONFIG_LIST_SESSION_KEY);
+            PluginList list = (PluginList) request.getPortletSession(true).getAttribute(CONFIG_LIST_SESSION_KEY);
             if(list == null) {
-                list = PortletManager.getCurrentServer(request).getConfigurationInstaller().listConfigurations(new URL(repo), user, pass);
+                list = PortletManager.getCurrentServer(request).getPluginInstaller().listPlugins(new URL(repo), user, pass);
                 request.getPortletSession(true).setAttribute(CONFIG_LIST_SESSION_KEY, list);
             }
-            for (int i = 0; i < list.getConfigurations().length; i++) {
-                ConfigurationMetadata metadata = list.getConfigurations()[i];
-                if(metadata.getConfigId().toString().equals(configId)) {
+            for (int i = 0; i < list.getPlugins().length; i++) {
+                PluginMetadata metadata = list.getPlugins()[i];
+                if(metadata.getModuleId().toString().equals(configId)) {
                     config = metadata;
                     break;
                 }
@@ -106,14 +101,14 @@
         if(proceed) {
             String configId = request.getParameter("configId");
 
-            ConfigurationList installList;
+            PluginList installList;
             try {
-                ConfigurationList list = (ConfigurationList) request.getPortletSession(true).getAttribute(CONFIG_LIST_SESSION_KEY);
+                PluginList list = (PluginList) request.getPortletSession(true).getAttribute(CONFIG_LIST_SESSION_KEY);
                 if(list == null) {
-                    list = PortletManager.getCurrentServer(request).getConfigurationInstaller().listConfigurations(new URL(repo), user, pass);
+                    list = PortletManager.getCurrentServer(request).getPluginInstaller().listPlugins(new URL(repo), user, pass);
                     request.getPortletSession(true).setAttribute(CONFIG_LIST_SESSION_KEY, list);
                 }
-                installList = ConfigurationList.createInstallList(list, Artifact.create(configId));
+                installList = PluginList.createInstallList(list, Artifact.create(configId));
             } catch (FailedLoginException e) {
                 throw new PortletException("Invalid login for Maven repository '"+repo+"'", e);
             }
@@ -121,7 +116,7 @@
                 throw new PortletException("No configuration found for '"+configId+"'");
             }
 
-            ConfigurationInstaller configInstaller = PortletManager.getCurrentServer(request).getConfigurationInstaller(); 
+            PluginInstaller configInstaller = PortletManager.getCurrentServer(request).getPluginInstaller();
             Object downloadKey = configInstaller.startInstall(installList, user, pass);
             ProgressInfo progressInfo = new ProgressInfo();
             request.getPortletSession(true).setAttribute(ProgressInfo.PROGRESS_INFO_KEY, progressInfo, PortletSession.APPLICATION_SCOPE);
@@ -137,12 +132,12 @@
     }
 
     public static class Installer implements Runnable {
-        private ConfigurationInstaller configInstaller;
+        private PluginInstaller configInstaller;
         private Object downloadKey;
         private ProgressInfo progressInfo;
         private PortletSession session;
 
-        public Installer(ConfigurationInstaller configInstaller, Object downloadKey, ProgressInfo progressInfo, PortletSession session) {
+        public Installer(PluginInstaller configInstaller, Object downloadKey, ProgressInfo progressInfo, PortletSession session) {
             this.configInstaller = configInstaller;
             this.downloadKey = downloadKey;
             this.progressInfo = progressInfo;
@@ -153,20 +148,20 @@
             DownloadResults results;
 
             while (true) {
-            	results = configInstaller.checkOnInstall(downloadKey);
-            	progressInfo.setMainMessage(results.getCurrentMessage());
-            	progressInfo.setProgressPercent(results.getCurrentFilePercent());
+                results = configInstaller.checkOnInstall(downloadKey);
+                progressInfo.setMainMessage(results.getCurrentMessage());
+                progressInfo.setProgressPercent(results.getCurrentFilePercent());
                 progressInfo.setFinished(results.isFinished());
                 log.info(progressInfo.getMainMessage());
                 if (results.isFinished()) {
                     log.info("Installation finished");
                     session.setAttribute(DOWNLOAD_RESULTS_SESSION_KEY, results);
                     break;
-            	} else {
-            		try { Thread.sleep(1000); } catch (InterruptedException e) {
+                } else {
+                    try { Thread.sleep(1000); } catch (InterruptedException e) {
                         log.error("Download monitor thread interrupted", e);
-					}
-            	}
+                    }
+                }
             }
         }
     }

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadStatusHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadStatusHandler.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadStatusHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/DownloadStatusHandler.java Wed May  3 21:09:17 2006
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.net.URL;
 import java.util.List;
 import java.util.ArrayList;
 import javax.portlet.ActionRequest;
@@ -25,18 +24,11 @@
 import javax.portlet.PortletException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletSession;
-import javax.security.auth.login.FailedLoginException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.ajax.ProgressInfo;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.system.configuration.ConfigurationMetadata;
-import org.apache.geronimo.system.configuration.ConfigurationList;
-import org.apache.geronimo.system.configuration.ConfigurationInstaller;
-import org.apache.geronimo.system.configuration.DownloadResults;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.system.plugin.DownloadResults;
 
 /**
  * Handler for the initial download screen.

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java Wed May  3 21:09:17 2006
@@ -32,12 +32,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.system.configuration.ConfigurationArchiveData;
-import org.apache.geronimo.system.configuration.ConfigurationMetadata;
+import org.apache.geronimo.system.plugin.PluginMetadata;
 
 /**
  * Handler for the screen where you configure plugin data before exporting
@@ -61,14 +57,15 @@
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
         String configId = request.getParameter("configId");
-        ConfigurationArchiveData data = PortletManager.getCurrentServer(request).getConfigurationInstaller().getPluginMetadata(Artifact.create(configId));
-        request.setAttribute("configId", data.getConfiguration().getConfigId());
-        request.setAttribute("name", data.getConfiguration().getName());
-        request.setAttribute("sourceRepository", data.getRepository() == null ? null : data.getRepository().toString());
-        request.setAttribute("backupRepository", combine(data.getBackups()));
-        request.setAttribute("category", data.getConfiguration().getCategory());
-        request.setAttribute("description", data.getConfiguration().getDescription());
-        ConfigurationMetadata.License[] licenses = data.getConfiguration().getLicenses();
+        PluginMetadata data = PortletManager.getCurrentServer(request).getPluginInstaller().getPluginMetadata(Artifact.create(configId));
+        request.setAttribute("configId", data.getModuleId());
+        request.setAttribute("name", data.getName());
+        request.setAttribute("repository", combine(data.getRepositories()));
+        request.setAttribute("category", data.getCategory());
+        request.setAttribute("url", data.getPluginURL());
+        request.setAttribute("author", data.getAuthor());
+        request.setAttribute("description", data.getDescription());
+        PluginMetadata.License[] licenses = data.getLicenses();
         if(licenses != null && licenses.length > 0) {
             request.setAttribute("license", licenses[0].getName());
             if(licenses[0].isOsiApproved()) {
@@ -78,16 +75,16 @@
                 log.warn("Unable to edit plugin metadata containing more than one license!  Additional license data will not be editable.");
             }
         }
-        request.setAttribute("gerVersions", combine(data.getConfiguration().getGeronimoVersions()));
-        request.setAttribute("jvmVersions", combine(data.getConfiguration().getJvmVersions()));
-        request.setAttribute("dependencies", combine(data.getConfiguration().getDependencies()));
-        request.setAttribute("obsoletes", combine(data.getConfiguration().getObsoletes()));
-        ConfigurationMetadata.Prerequisite[] reqs = data.getConfiguration().getPrerequisites();
+        request.setAttribute("gerVersions", combine(data.getGeronimoVersions()));
+        request.setAttribute("jvmVersions", combine(data.getJvmVersions()));
+        request.setAttribute("dependencies", combine(data.getDependencies()));
+        request.setAttribute("obsoletes", combine(data.getObsoletes()));
+        PluginMetadata.Prerequisite[] reqs = data.getPrerequisites();
         if(reqs != null && reqs.length > 0) {
             for (int i = 0; i < reqs.length; i++) {
-                ConfigurationMetadata.Prerequisite req = reqs[i];
+                PluginMetadata.Prerequisite req = reqs[i];
                 String prefix = "prereq" + (i+1);
-                request.setAttribute(prefix, req.getConfigId().toString());
+                request.setAttribute(prefix, req.getModuleId().toString());
                 request.setAttribute(prefix +"type", req.getResourceType());
                 request.setAttribute(prefix +"desc", req.getDescription());
             }
@@ -100,9 +97,10 @@
     public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
         String configId = request.getParameter("configId");
         String name = request.getParameter("name");
-        String repo = request.getParameter("sourceRepository");
-        String backups = request.getParameter("backupRepository");
+        String repo = request.getParameter("repository");
         String category = request.getParameter("category");
+        String url = request.getParameter("url");
+        String author = request.getParameter("author");
         String description = request.getParameter("description");
         String license = request.getParameter("license");
         String osi = request.getParameter("licenseOSI");
@@ -110,21 +108,21 @@
         String jvms = request.getParameter("jvmVersions");
         String deps = request.getParameter("dependencies");
         String obsoletes = request.getParameter("obsoletes");
-        ConfigurationArchiveData data = PortletManager.getCurrentServer(request).getConfigurationInstaller().getPluginMetadata(Artifact.create(configId));
-        ConfigurationMetadata metadata = new ConfigurationMetadata(data.getConfiguration().getConfigId(),
-                name, description, category, true, false);
+        PluginMetadata data = PortletManager.getCurrentServer(request).getPluginInstaller().getPluginMetadata(Artifact.create(configId));
+        PluginMetadata metadata = new PluginMetadata(name, data.getModuleId(),
+                description, category, 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();
         if(license != null && !license.trim().equals("")) {
-            licenses.add(new ConfigurationMetadata.License(license.trim(), osi != null && !osi.equals("")));
+            licenses.add(new PluginMetadata.License(license.trim(), osi != null && !osi.equals("")));
         }
-        for (int i = 1; i < data.getConfiguration().getLicenses().length; i++) {
-            licenses.add(data.getConfiguration().getLicenses()[i]);
+        for (int i = 1; i < data.getLicenses().length; i++) {
+            licenses.add(data.getLicenses()[i]);
         }
-        metadata.setLicenses((ConfigurationMetadata.License[]) licenses.toArray(new ConfigurationMetadata.License[licenses.size()]));
+        metadata.setLicenses((PluginMetadata.License[]) licenses.toArray(new PluginMetadata.License[licenses.size()]));
         List prereqs = new ArrayList();
         int counter = 1;
         while(true) {
@@ -142,20 +140,16 @@
             if(desc != null && desc.trim().equals("")) {
                 desc = null;
             }
-            prereqs.add(new ConfigurationMetadata.Prerequisite(Artifact.create(id), false, type, desc));
+            prereqs.add(new PluginMetadata.Prerequisite(Artifact.create(id), false, type, desc));
         }
-        for (int i = 3; i < data.getConfiguration().getPrerequisites().length; i++) {
-            ConfigurationMetadata.Prerequisite req = data.getConfiguration().getPrerequisites()[i];
+        for (int i = 3; i < data.getPrerequisites().length; i++) {
+            PluginMetadata.Prerequisite req = data.getPrerequisites()[i];
             prereqs.add(req);
         }
-        metadata.setPrerequisites((ConfigurationMetadata.Prerequisite[]) prereqs.toArray(new ConfigurationMetadata.Prerequisite[prereqs.size()]));
-        URL repoURL = null;
-        if(repo != null && !repo.trim().equals("")) {
-            repoURL = new URL(repo);
-        }
-        URL[] backupURLs = splitURLs(backups);
-        data = new ConfigurationArchiveData(repoURL, backupURLs, metadata);
-        PortletManager.getCurrentServer(request).getConfigurationInstaller().updatePluginMetadata(data);
+        metadata.setPrerequisites((PluginMetadata.Prerequisite[]) prereqs.toArray(new PluginMetadata.Prerequisite[prereqs.size()]));
+        URL[] backupURLs = splitURLs(repo);
+        metadata.setRepositories(backupURLs);
+        PortletManager.getCurrentServer(request).getPluginInstaller().updatePluginMetadata(metadata);
 
         response.setRenderParameter("configId", configId);
         response.setRenderParameter("name", name);

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/GeronimoAsMavenServlet.java Wed May  3 21:09:17 2006
@@ -39,29 +39,23 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.console.util.KernelManagementHelper;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Dependency;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.Version;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.system.configuration.ConfigurationInstaller;
-import org.apache.geronimo.system.configuration.ConfigurationArchiveData;
-import org.apache.geronimo.system.configuration.ConfigurationMetadata;
+import org.apache.geronimo.system.plugin.PluginInstaller;
+import org.apache.geronimo.system.plugin.PluginMetadata;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -91,7 +85,7 @@
             response.setContentType("text/xml");
             if(reply) {
                 try {
-                    generateConfigFile(kernel, response.getWriter());
+                    generateConfigFile(request, kernel, response.getWriter());
                 } catch (Exception e) {
                     throw new ServletException("Unable to generate Geronimo configuration list", e);
                 }
@@ -200,16 +194,14 @@
         return false;
     }
 
-    private void generateConfigFile(Kernel kernel, PrintWriter out) throws ParserConfigurationException, NoSuchStoreException, TransformerException {
-        KernelManagementHelper helper = new KernelManagementHelper(kernel);
-        ServerInfo serverInfo = helper.getServers(helper.getDomains()[0])[0].getServerInfo();
-        String version = serverInfo.getVersion();
+    private void generateConfigFile(HttpServletRequest request, Kernel kernel, PrintWriter out) throws ParserConfigurationException, NoSuchStoreException, TransformerException {
         ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
-        ConfigurationInstaller installer = getInstaller(kernel);
+        PluginInstaller installer = getInstaller(kernel);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
         DocumentBuilder builder = factory.newDocumentBuilder();
         Document doc = builder.newDocument();
-        Element root = doc.createElement("geronimo-plugin-list");
+        Element root = doc.createElementNS("http://geronimo.apache.org/xml/ns/plugins-1.1", "geronimo-plugin-list");
         doc.appendChild(root);
         List stores = mgr.listStores();
         for (int i = 0; i < stores.size(); i++) {
@@ -217,21 +209,27 @@
             List configs = mgr.listConfigurations(name);
             for (int j = 0; j < configs.size(); j++) {
                 ConfigurationInfo info = (ConfigurationInfo) configs.get(j);
-                ConfigurationArchiveData archiveData = installer.getPluginMetadata(info.getConfigID());
-                ConfigurationMetadata data = archiveData.getConfiguration();
-                Element config = doc.createElement("configuration");
+                PluginMetadata data = installer.getPluginMetadata(info.getConfigID());
+                Element config = doc.createElement("plugin");
                 root.appendChild(config);
                 createText(doc, config, "name", data.getName());
-                createText(doc, config, "config-id", data.getConfigId().toString());
+                createText(doc, config, "module-id", data.getModuleId().toString());
                 createText(doc, config, "category", "Geronimo Deployments");
                 createText(doc, config, "description", data.getCategory().equals("Unknown") ? "Automatically generated plugin metadata" : data.getDescription());
+                if(data.getPluginURL() != null) {
+                    createText(doc, config, "url", data.getPluginURL());
+                }
+                if(data.getAuthor() != null) {
+                    createText(doc, config, "author", data.getAuthor());
+                }
                 for (int k = 0; k < data.getLicenses().length; k++) {
-                    ConfigurationMetadata.License license = data.getLicenses()[k];
+                    PluginMetadata.License license = data.getLicenses()[k];
                     Element lic = doc.createElement("license");
                     lic.setAttribute("osi-approved", Boolean.toString(license.isOsiApproved()));
                     createText(doc, lic, license.getName());
                     config.appendChild(lic);
                 }
+                // Skip hash since the CAR will be re-exported anyway and the file will be different
                 String[] versions = data.getGeronimoVersions();
                 for (int k = 0; k < versions.length; k++) {
                     String ver = versions[k];
@@ -243,7 +241,7 @@
                     createText(doc, config, "jvm-version", ver);
                 }
                 for (int k = 0; k < data.getPrerequisites().length; k++) {
-                    ConfigurationMetadata.Prerequisite prereq = data.getPrerequisites()[k];
+                    PluginMetadata.Prerequisite prereq = data.getPrerequisites()[k];
                     writePrerequisite(doc, config, prereq);
                 }
                 for (int k = 0; k < data.getDependencies().length; k++) {
@@ -254,20 +252,25 @@
                     String obs = data.getObsoletes()[k];
                     createText(doc, config, "obsoletes", obs);
                 }
+                // Skip repositories since we want the download to come from here
             }
         }
+        String repo = request.getProtocol()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+request.getServletPath();
+        if(!repo.endsWith("/")) repo += "/";
+        createText(doc, root, "default-repository", repo);
         TransformerFactory xfactory = TransformerFactory.newInstance();
         Transformer xform = xfactory.newTransformer();
         xform.setOutputProperty(OutputKeys.INDENT, "yes");
+        xform.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
         xform.transform(new DOMSource(doc), new StreamResult(out));
     }
 
-    private ConfigurationInstaller getInstaller(Kernel kernel) {
-        Set names = kernel.listGBeans(new AbstractNameQuery(ConfigurationInstaller.class.getName()));
+    private PluginInstaller getInstaller(Kernel kernel) {
+        Set names = kernel.listGBeans(new AbstractNameQuery(PluginInstaller.class.getName()));
         if(names.size() == 0) {
             return null;
         }
-        return (ConfigurationInstaller) kernel.getProxyManager().createProxy((AbstractName) names.iterator().next(), ConfigurationInstaller.class);
+        return (PluginInstaller) kernel.getProxyManager().createProxy((AbstractName) names.iterator().next(), PluginInstaller.class);
     }
 
     private void generateMavenFile(Kernel kernel, PrintWriter writer, String groupId, String artifactId, boolean reply) throws ParserConfigurationException, TransformerException {
@@ -301,10 +304,10 @@
         xform.transform(new DOMSource(doc), new StreamResult(writer));
     }
 
-    private void writePrerequisite(Document doc, Element config, ConfigurationMetadata.Prerequisite req) {
+    private void writePrerequisite(Document doc, Element config, PluginMetadata.Prerequisite req) {
         Element prereq = doc.createElement("prerequisite");
         config.appendChild(prereq);
-        createText(doc, prereq, "id", req.getConfigId().toString());
+        createText(doc, prereq, "id", req.getModuleId().toString());
         createText(doc, prereq, "resource-type", req.getResourceType());
         createText(doc, prereq, "description", req.getDescription());
     }

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java Wed May  3 21:09:17 2006
@@ -38,6 +38,7 @@
         addHelper(new ExportConfigHandler(), config);
         addHelper(new ExportHandler(), config);
         addHelper(new DownloadStatusHandler(), config);
+        addHelper(new UpdateListHandler(), config);
     }
 
     protected String getModelJSPVariableName() {

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/IndexHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/IndexHandler.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/IndexHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/IndexHandler.java Wed May  3 21:09:17 2006
@@ -17,6 +17,9 @@
 package org.apache.geronimo.console.car;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
@@ -25,6 +28,7 @@
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.util.ConfigurationData;
 import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.system.plugin.PluginRepositoryList;
 
 /**
  * Handler for the import export main screen.
@@ -37,16 +41,22 @@
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        String repo = request.getParameter("repository");
+        if(repo != null) response.setRenderParameter("repository", repo);
         return getMode();
     }
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+        PluginRepositoryList[] lists = PortletManager.getCurrentServer(request).getPluginRepositoryLists();
+        List list = new ArrayList();
+        for (int i = 0; i < lists.length; i++) {
+            PluginRepositoryList repo = lists[i];
+            list.addAll(Arrays.asList(repo.getRepositories()));
+        }
         ConfigurationData[] configs = PortletManager.getConfigurations(request, null, false);
         request.setAttribute("configurations", configs);
+        request.setAttribute("repositories", list);
         String repository = request.getParameter("repository");
-        if(repository == null) {
-            repository = "http://www.geronimoplugins.com/repository/";
-        }
         request.setAttribute("repository", repository);
     }
 

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java Wed May  3 21:09:17 2006
@@ -32,8 +32,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.system.configuration.ConfigurationMetadata;
-import org.apache.geronimo.system.configuration.ConfigurationList;
+import org.apache.geronimo.system.plugin.PluginList;
+import org.apache.geronimo.system.plugin.PluginMetadata;
 import java.util.Collections;
 import java.util.Collection;
 import java.util.Iterator;
@@ -78,15 +78,15 @@
     }
 
     private void loadFromRepository(RenderRequest request, String repository, String username, String password) throws IOException, PortletException {
-        ConfigurationList data;
+        PluginList data;
         try {
-            data = PortletManager.getCurrentServer(request).getConfigurationInstaller().listConfigurations(new URL(repository), username, password);
+            data = PortletManager.getCurrentServer(request).getPluginInstaller().listPlugins(new URL(repository), username, password);
         } catch (FailedLoginException e) {
             throw new PortletException("Invalid login for Maven repository '"+repository+"'", e);
         }
         Map results = new HashMap();
-        for (int i = 0; i < data.getConfigurations().length; i++) {
-            ConfigurationMetadata metadata = data.getConfigurations()[i];
+        for (int i = 0; i < data.getPlugins().length; i++) {
+            PluginMetadata metadata = data.getPlugins()[i];
             List values = (List) results.get(metadata.getCategory());
             if(values == null) {
                 values = new ArrayList();

Added: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/UpdateListHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/UpdateListHandler.java?rev=399534&view=auto
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/UpdateListHandler.java (added)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/UpdateListHandler.java Wed May  3 21:09:17 2006
@@ -0,0 +1,57 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.car;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.console.util.ConfigurationData;
+import org.apache.geronimo.system.plugin.PluginRepositoryList;
+
+/**
+ * Handler to update the list of available plugin repositories
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class UpdateListHandler extends BaseImportExportHandler {
+    public UpdateListHandler() {
+        super(UPDATE_REPOS_MODE, null);
+    }
+
+    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        PluginRepositoryList[] lists = PortletManager.getCurrentServer(request).getPluginRepositoryLists();
+        for (int i = 0; i < lists.length; i++) {
+            lists[i].refresh();
+        }
+        return INDEX_MODE+BEFORE_ACTION;
+    }
+
+    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+    }
+
+    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+        return INDEX_MODE+BEFORE_ACTION;
+    }
+}

Propchange: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/UpdateListHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/index.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/index.jsp?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/index.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/index.jsp Wed May  3 21:09:17 2006
@@ -20,12 +20,21 @@
 
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="index-after" />
-    <b>Repository:</b> <input type="text" name="repository" value="${repository}" size="30" maxlength="200" />
-    <input type="submit" value="Search for Plugins" />
-    <br /><b>Optional Authentication:</b>
-       User: <input type="text" name="username" value="${repouser}" size="20" maxlength="200" />
-       Password: <input type="password" name="password" value="${repopass}" size="20" maxlength="200" />
-
+    <b>Repository:</b> <%-- todo: entry field for user-specified list --%>
+    <select name="repository">
+        <c:forEach var="repo" items="${repositories}">
+            <option<c:if test="${repo eq repository}"> selected</c:if>>${repo}</option>
+        </c:forEach>
+    </select>
+    <c:if test="${!empty repositories}"><br /></c:if>
+    <i>(<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="updateList-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>">Update Repository List</a>)</i>
+    <%--<input type="text" name="repository" value="${repository}" size="30" maxlength="200" />--%>
+    <c:if test="${!empty repositories}">
+      <input type="submit" value="Search for Plugins" />
+      <br /><b>Optional Authentication:</b>
+         User: <input type="text" name="username" value="${repouser}" size="12" maxlength="200" />
+         Password: <input type="password" name="password" value="${repopass}" size="12" maxlength="200" />
+    </c:if>
 </form>
 
 <h2>Create Geronimo Plugin</h2>

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/list.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/list.jsp?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/list.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/list.jsp Wed May  3 21:09:17 2006
@@ -24,7 +24,7 @@
                       <c:if test="${!entry.eligible}">
                           <c:forEach var="prereq" items="${entry.prerequisites}">
                               <c:if test="${!prereq.present}">
-                                  (${prereq.configIdWithStars} is not installed)
+                                  (${prereq.moduleIdWithStars} is not installed)
                               </c:if>
                           </c:forEach>
                       </c:if>
@@ -33,7 +33,7 @@
           </li>
         </c:when>
         <c:otherwise>
-          <li><a href="<portlet:actionURL><portlet:param name="configId" value="${entry.configId}"/><portlet:param name="repository" value="${repository}"/><portlet:param name="repo-user" value="${repouser}"/><portlet:param name="repo-pass" value="${repopass}"/><portlet:param name="mode" value="download-before"/></portlet:actionURL>">${entry.name}<c:if test="${entry.name ne entry.configId}"> (${entry.version})</c:if></a></li>
+          <li><a href="<portlet:actionURL><portlet:param name="configId" value="${entry.moduleId}"/><portlet:param name="repository" value="${repository}"/><portlet:param name="repo-user" value="${repouser}"/><portlet:param name="repo-pass" value="${repopass}"/><portlet:param name="mode" value="download-before"/></portlet:actionURL>">${entry.name}<c:if test="${entry.name ne entry.moduleId}"> (${entry.version})</c:if></a></li>
         </c:otherwise>
       </c:choose>
     </c:forEach>

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/pluginParams.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/pluginParams.jsp?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/pluginParams.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/pluginParams.jsp Wed May  3 21:09:17 2006
@@ -36,30 +36,19 @@
               the version number for the plugin, so make sure it's correct.
             </td>
           </tr>
-        <!-- ENTRY FIELD: Source Repository -->
-          <tr>
-            <th style="min-width: 140px"><div align="right">Download Repository:</div></th>
-            <td><input name="sourceRepository" type="text" size="30" value="${sourceRepository}" /></td>
-          </tr>
-          <tr>
-            <td></td>
-            <td>
-              The main repository that should be checked when downloading dependencies
-              for this plugin.  This should be a URL, such as
-              <tt>http://geronimoplugins.com/repository/</tt>
-            </td>
           </tr>
-        <!-- ENTRY FIELD: Backup Repository -->
+        <!-- ENTRY FIELD: Repositories -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Additional Repositories:</div></th>
-            <td><textarea rows="5" cols="60" name="backupRepository">${backupRepository}</textarea></td>
+            <th style="min-width: 140px"><div align="right">Download Repositories:</div></th>
+            <td><textarea rows="5" cols="60" name="repository">${repository}</textarea></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              A list of additional repositories to check for any dependencies that are
-              not present in the main repository.  This should be a list of one URL per
-              line, with values such as <tt>http://www.ibiblio.org/maven2/</tt>
+              A list of repositories to check for any dependencies that need to be downloaded.
+              This should be a list of one URL per line, with values such as
+              <tt>http://geronimoplugins.com/repository/</tt> and <tt>http://www.ibiblio.org/maven2/</tt>.
+              Note that the repository this plugin is deployed to should typically be the first one listed.
             </td>
           </tr>
         <!-- ENTRY FIELD: Category -->
@@ -88,6 +77,28 @@
             <td>
               A description of this plugin.  You should use plain text only, with
               blank lines to separate paragraphs.
+            </td>
+          </tr>
+        <!-- ENTRY FIELD: URL -->
+          <tr>
+            <th style="min-width: 140px"><div align="right">Plugin URL:</div></th>
+              <td><input name="url" type="text" size="30" value="${url}" /></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>
+              A URL to get more information about the plugin (e.g. the plugin home page).
+            </td>
+          </tr>
+        <!-- ENTRY FIELD: Author -->
+          <tr>
+            <th style="min-width: 140px"><div align="right">Author:</div></th>
+              <td><input name="author" type="text" size="30" value="${author}" /></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>
+              The author of the plug, which may be a person, company, open source project, etc.
             </td>
           </tr>
         <!-- ENTRY FIELD: License -->

Modified: geronimo/branches/1.1/configs/console-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Geronimo Admin Console (Jetty)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Core Geronimo</category>
 <description>The web-based administration console for Geronimo.  You can
 reach it via HTTP at /console and use it to configure the Geronimo
@@ -10,6 +9,8 @@
 security realms, keystores, etc.  It provides simple statistics on the
 running Geronimo server, as well as letting you review and deploy applications
 and plugins.</description>
+<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>
 <prerequisite>
@@ -40,7 +41,7 @@
 <dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
 <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
 <dependency>geronimo/geronimo-converter//jar</dependency>
-<dependency>geronimo/geronimo-util//jar</dependency></configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
+<dependency>geronimo/geronimo-util//jar</dependency>
+<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/branches/1.1/configs/console-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Geronimo Admin Console (Tomcat)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Core Geronimo</category>
 <description>The web-based administration console for Geronimo.  You can
 reach it via HTTP at /console and use it to configure the Geronimo
@@ -10,6 +9,8 @@
 security realms, keystores, etc.  It provides simple statistics on the
 running Geronimo server, as well as letting you review and deploy applications
 and plugins.</description>
+<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>
 <prerequisite>
@@ -41,7 +42,6 @@
 <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
 <dependency>geronimo/geronimo-converter//jar</dependency>
 <dependency>geronimo/geronimo-util//jar</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/directory/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/directory/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/directory/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/directory/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Apache Directory 0.92 for Geronimo</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Security</category>
 <description>
-  This plugin integrates the Apache Directory Server (ApacheDS)
-  LDAP server with Geronimo.  That means that Geronimo will run
-  an embedded LDAP server when it starts.  This LDAP server may
-  be used for LDAP security realms within Geronimo, as well as
-  for other purposes by Geronimo applications or by remote
-  applications.
+This plugin integrates the Apache Directory Server (ApacheDS)
+LDAP server with Geronimo.  That means that Geronimo will run
+an embedded LDAP server when it starts.  This LDAP server may
+be used for LDAP security realms within Geronimo, as well as
+for other purposes by Geronimo applications or by remote
+applications.
   
-  This plugin does not presently include any tools for managing
-  or inspecting the LDAP server, though Geronimo itself includes
-  a security realm that works with LDAP.
+This plugin does not presently include any tools for managing
+or inspecting the LDAP server, though Geronimo itself includes
+a security realm that works with LDAP.
   
-  For more information on the ApacheDS project, see
-  http://directory.apache.org/subprojects/apacheds/index.html
+For more information on the ApacheDS project, see
+http://directory.apache.org/subprojects/apacheds/index.html
 </description>
+<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>
 <dependency>geronimo/j2ee-server//car</dependency>
 <dependency>geronimo/geronimo-directory//jar</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Wed May  3 21:09:17 2006
@@ -155,8 +155,9 @@
         <reference name="SecurityRealms"/>
         <reference name="LoginServices"/>
         <reference name="KeystoreManagers"/>
-        <reference name="ConfigurationInstaller">
-            <name>ConfigurationInstaller</name>
+        <reference name="PluginRepoLists"/>
+        <reference name="PluginInstaller">
+            <name>PluginInstaller</name>
         </reference>
         <reference name="ConfigurationManager">
             <name>ConfigurationManager</name>

Modified: geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-jetty/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Jakarta JSP Examples (Jetty)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Examples</category>
 <description>The JSP examples originally developed for Tomcat.  Can be found
 via HTTP at /jsp-examples/ after installation.  These examples give
 a basic introduction to JSP development along with sample code.</description>
+<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>
 <prerequisite>
@@ -16,7 +17,6 @@
 </prerequisite>
 <dependency>commons-collections/commons-collections/3.1/jar</dependency>
 <dependency>geronimo/j2ee-server//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-tomcat/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Jakarta JSP Examples (Tomcat)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Examples</category>
 <description>The JSP examples originally developed for Tomcat.  Can be found
 via HTTP at /jsp-examples/ after installation.  These examples give
 a basic introduction to JSP development along with sample code.</description>
+<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>
 <prerequisite>
@@ -15,7 +16,6 @@
 <description>This version of the JSP Examples works with the Geronimo/Tomcat distribution.  It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version of the JSP Examples application that works with Jetty.  Please install the version appropriate to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>LDAP Example Web App (Jetty)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Examples</category>
 <description>A web application that walks you through configuring the sample
-    data in the embedded Apache Directory LDAP server, and then tests logins
-    with a demonstration security realm configured for that LDAP server.
-    The LDAP Example web application be found via HTTP at /ldap-demo/ after
-    the plugin is installed.</description>
+data in the embedded Apache Directory LDAP server, and then tests logins
+with a demonstration security realm configured for that LDAP server.
+The LDAP Example web application be found via HTTP at /ldap-demo/ after
+the plugin is installed.</description>
+<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>
 <prerequisite>
@@ -18,7 +19,6 @@
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
 <dependency>geronimo/ldap-realm//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>LDAP Example Web App (Tomcat)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Examples</category>
 <description>A web application that walks you through configuring the sample
-    data in the embedded Apache Directory LDAP server, and then tests logins
-    with a demonstration security realm configured for that LDAP server.
-    The LDAP Example web application be found via HTTP at /ldap-demo/ after
-    the plugin is installed.</description>
+data in the embedded Apache Directory LDAP server, and then tests logins
+with a demonstration security realm configured for that LDAP server.
+The LDAP Example web application be found via HTTP at /ldap-demo/ after
+the plugin is installed.</description>
+<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>
 <prerequisite>
@@ -18,7 +19,6 @@
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
 <dependency>geronimo/ldap-realm//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/ldap-realm/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>LDAP Example Security Realm</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Examples</category>
 <description>A sample security realm pointing to an embedded Apache Directory
-   LDAP server.  This is normally used with the LDAP Example Web Application,
-   which has instructions for setting up the LDAP server and screens to test
-   logins.  You don't need this plugin in order to create LDAP security realms,
-   this is just a sample.</description>
+LDAP server.  This is normally used with the LDAP Example Web Application,
+which has instructions for setting up the LDAP server and screens to test
+logins.  You don't need this plugin in order to create LDAP security realms,
+this is just a sample.</description>
+<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>
 <dependency>geronimo/j2ee-server//car</dependency>
 <dependency>geronimo/directory//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml Wed May  3 21:09:17 2006
@@ -73,7 +73,7 @@
     </gbean>
 
     <!-- Configuration Installer -->
-    <gbean name="ConfigurationInstaller" class="org.apache.geronimo.system.configuration.ConfigInstallerGBean">
+    <gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
       <reference name="Repository">
         <name>Repository</name>
       </reference>
@@ -89,5 +89,9 @@
       <reference name="ThreadPool">
         <name>DefaultThreadPool</name>
       </reference>
+    </gbean>
+
+    <gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
+        <attribute name="repositoryList">http://people.apache.org/~ammulder/plugin-repository-list.txt</attribute>
     </gbean>
 </configuration>

Modified: geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-jetty/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Jakarta Servlet Examples (Jetty)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Examples</category>
 <description>The Servlet examples originally developed for Tomcat.  Can be found
 via HTTP at /servlets-examples/ after installation.  These examples give
 a basic introduction to Servlet development along with sample code.</description>
+<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>
 <prerequisite>
@@ -15,7 +16,6 @@
 <description>This version of the Servlet Examples works with the Geronimo/Jetty distribution.  It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version of the Servlet Examples application that works with Tomcat.  Please install the version appropriate to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-tomcat/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Jakarta Servlet Examples (Tomcat)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Examples</category>
 <description>The Servlet examples originally developed for Tomcat.  Can be found
 via HTTP at /servlets-examples/ after installation.  These examples give
 a basic introduction to Servlet development along with sample code.</description>
+<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>
 <prerequisite>
@@ -15,7 +16,6 @@
 <description>This version of the Servlet Examples works with the Geronimo/Tomcat distribution.  It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version of the Servlet Examples application that works with Jetty.  Please install the version appropriate to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Geronimo Welcome Web App (Jetty)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Core Geronimo</category>
 <description>The welcome application for Geronimo.  This binds to / so it
 handles all requests that nothing else is bound to.  The main
 purpose is to greet users who are exploring Geronimo for the
 first time.  It should typically be removed or replaced for
 production applications.</description>
+<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>
 <prerequisite>
@@ -17,7 +18,6 @@
 <description>This version of the Welcome application works with the Geronimo/Jetty distribution.  It is not intended to run in the Geronimo/Tomcat distribution.  There is a separate version of the Welcome application that works with Tomcat.  Please install the version appropriate to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml (original)
+++ geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml Wed May  3 21:09:17 2006
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <name>Geronimo Welcome Web App (Tomcat)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
 <category>Core Geronimo</category>
 <description>The welcome application for Geronimo.  This binds to / so it
 handles all requests that nothing else is bound to.  The main
 purpose is to greet users who are exploring Geronimo for the
 first time.  It should typically be removed or replaced for
 production applications.</description>
+<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>
 <prerequisite>
@@ -17,7 +18,6 @@
 <description>This version of the Welcome application works with the Geronimo/Tomcat distribution.  It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version of the Welcome application that works with Jetty.  Please install the version appropriate to your Geronimo distribution.</description>
 </prerequisite>
 <dependency>geronimo/j2ee-server//car</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-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/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java?rev=399534&r1=399533&r2=399534&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java Wed May  3 21:09:17 2006
@@ -16,7 +16,8 @@
  */
 package org.apache.geronimo.deployment.plugin;
 
-import org.apache.geronimo.system.configuration.ConfigurationInstaller;
+import java.net.URL;
+import org.apache.geronimo.system.plugin.PluginInstaller;
 
 import javax.enterprise.deploy.spi.DeploymentManager;
 
@@ -25,5 +26,6 @@
  *
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
  */
-public interface GeronimoDeploymentManager extends DeploymentManager, ConfigurationInstaller {
+public interface GeronimoDeploymentManager extends DeploymentManager, PluginInstaller {
+    public URL[] getRepositories();
 }



Mime
View raw message