geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r609072 [1/2] - in /geronimo/server/trunk: applications/welcome/geronimo-welcome/ applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/ applications/welcome/welcome-jetty/ applications/welcome/welcome-tomcat/ asse...
Date Sat, 05 Jan 2008 00:47:25 GMT
Author: djencks
Date: Fri Jan  4 16:47:14 2008
New Revision: 609072

URL: http://svn.apache.org/viewvc?rev=609072&view=rev
Log:
GERONIMO-3732 steps 1, 2. Move plugin management and some jsr88 base code into a new module

Added:
    geronimo/server/trunk/framework/configs/plugin/
      - copied from r608186, geronimo/server/trunk/framework/configs/rmi-naming/
    geronimo/server/trunk/framework/configs/plugin/LICENSE.txt
      - copied unchanged from r609071, geronimo/server/trunk/framework/configs/rmi-naming/LICENSE.txt
    geronimo/server/trunk/framework/configs/plugin/NOTICE.txt
      - copied unchanged from r609071, geronimo/server/trunk/framework/configs/rmi-naming/NOTICE.txt
    geronimo/server/trunk/framework/configs/plugin/pom.xml
      - copied, changed from r609071, geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/plugin/src/
      - copied from r609071, geronimo/server/trunk/framework/configs/rmi-naming/src/
    geronimo/server/trunk/framework/modules/geronimo-plugin/
    geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt   (with props)
    geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt   (with props)
    geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml   (with props)
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/
      - copied from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ArchiverGBean.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ArchiverGBean.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/DownloadPoller.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/DownloadPoller.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/DownloadResults.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/DownloadResults.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
      - copied unchanged from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryList.java
      - copied unchanged from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryList.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginXmlUtil.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginXmlUtil.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ReferenceServerInstanceData.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ReferenceServerInstanceData.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerArchiver.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerArchiver.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/SnapshotVersion.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/SnapshotVersion.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/SourceRepository.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/SourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/SourceRepositoryFactory.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/SourceRepositoryFactory.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/xsd/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/xsd/plugins-1.3.xsd
      - copied unchanged from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/
      - copied from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/ArchiverGBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
      - copied, changed from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyFileTest.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/CopyFileTest.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
      - copied unchanged from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/archivertest/
      - copied from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/archivertest/bin/
      - copied from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/bin/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/archivertest/lib/
      - copied from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/lib/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/copyfiletest/
      - copied from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/copyfiletest/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/copyfiletest/repository/
      - copied from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/copyfiletest/repository/
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugin.xml
      - copied unchanged from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/geronimo-plugin.xml
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
      - copied unchanged from r608186, geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/geronimo-plugins.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/AttributesXmlUtil.java   (with props)
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java   (with props)
Removed:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/BaseMarkupSerializer.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ElementState.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/EncodingInfo.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Encodings.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/IndentPrinter.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Method.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/OutputFormat.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Printer.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SieveEncodingInfo.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/XMLSerializer.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ArchiverGBean.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/DownloadPoller.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/DownloadResults.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryList.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginXmlUtil.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ReferenceServerInstanceData.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerArchiver.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstance.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/SnapshotVersion.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/SourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/SourceRepositoryFactory.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/plugin/
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/archivertest/
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/copyfiletest/
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/geronimo-plugin.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/resources/geronimo-plugins.xml
Modified:
    geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml
    geronimo/server/trunk/applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/AbsentSampleServlet.java
    geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
    geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
    geronimo/server/trunk/framework/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ManageableAttributeStore.java
    geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java
    geronimo/server/trunk/framework/modules/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenAttributeStore.java
    geronimo/server/trunk/plugins/activemq/activemq-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-tomcat/pom.xml
    geronimo/server/trunk/plugins/clustering/clustering/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ajax/ProgressMonitor.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/DownloadCARHandler.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/IndexHandler.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/ListHandler.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/UpdateListHandler.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/ViewPluginDownloadHandler.java
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
    geronimo/server/trunk/plugins/hotdeploy/hot-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-jetty/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database-jetty/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database-tomcat/pom.xml
    geronimo/server/trunk/testsupport/testsupport-common/src/main/java/org/apache/geronimo/testsupport/DOMUtils.java

Modified: geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml Fri Jan  4 16:47:14 2008
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-system</artifactId>
+            <artifactId>geronimo-plugin</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/AbsentSampleServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/AbsentSampleServlet.java?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/AbsentSampleServlet.java (original)
+++ geronimo/server/trunk/applications/welcome/geronimo-welcome/src/main/java/org/apache/geronimo/welcome/AbsentSampleServlet.java Fri Jan  4 16:47:14 2008
@@ -29,6 +29,7 @@
 
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -54,7 +55,7 @@
 public class AbsentSampleServlet extends HttpServlet {
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String install = request.getParameter("install");
-        if(install != null && !install.equals("")) {
+        if (install != null && !install.equals("")) {
             doInstall(request, response);
         } else {
             doMessage(request, response);
@@ -85,18 +86,18 @@
         //todo this is surely wrong
         list.getDefaultRepository().add("http://www.ibiblio.org/maven2/");
         DownloadResults results = installer.install(list, repo.toString(), false, null, null);
-        if(results.isFailed()) {
+        if (results.isFailed()) {
             throw new ServletException("Unable to install sample application", results.getFailure());
         }
         ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
         for (int i = 0; i < results.getInstalledConfigIDs().length; i++) {
             Artifact artifact = results.getInstalledConfigIDs()[i];
-            if(mgr.isConfiguration(artifact)) {
+            if (mgr.isConfiguration(artifact)) {
                 try {
-                    if(!mgr.isLoaded(artifact)) {
+                    if (!mgr.isLoaded(artifact)) {
                         mgr.loadConfiguration(artifact);
                     }
-                    if(!mgr.isRunning(artifact)) {
+                    if (!mgr.isRunning(artifact)) {
                         mgr.startConfiguration(artifact);
                     }
                 } catch (NoSuchConfigException e) {
@@ -106,7 +107,7 @@
                 }
             }
         }
-        response.sendRedirect(request.getContextPath()+request.getServletPath()+"/");
+        response.sendRedirect(request.getContextPath() + request.getServletPath() + "/");
     }
 
     private String getServerType() {
@@ -115,26 +116,29 @@
 
     private PluginInstaller getPluginInstaller(Kernel kernel) throws ServletException {
         Set installers = kernel.listGBeans(new AbstractNameQuery(PluginInstaller.class.getName()));
-        if(installers.size() == 0) {
+        if (installers.size() == 0) {
             throw new ServletException("Unable to install sample application; no plugin installer found");
         }
-       return (PluginInstaller)kernel.getProxyManager().createProxy((AbstractName) installers.iterator().next(),
-                                                                    PluginInstaller.class);
+        try {
+            return (PluginInstaller) kernel.getGBean((AbstractName) installers.iterator().next());
+        } catch (GBeanNotFoundException e) {
+            throw new ServletException("Unable to install sample application, plugin installer cannot be retrieved from kernel");
+        }
     }
 
     private URL getFirstPluginRepository(Kernel kernel) throws ServletException {
         Set installers = kernel.listGBeans(new AbstractNameQuery(PluginRepositoryList.class.getName()));
-        if(installers.size() == 0) {
+        if (installers.size() == 0) {
             throw new ServletException("Unable to install sample application; no plugin repository list found");
         }
         PluginRepositoryList repos = ((PluginRepositoryList) kernel.getProxyManager().createProxy((AbstractName) installers.iterator().next(),
                 PluginRepositoryList.class));
 
         List<URL> urls = repos.getRepositories();
-        if(urls.isEmpty()) {
+        if (urls.isEmpty()) {
             repos.refresh();
             urls = repos.getRepositories();
-            if(urls.isEmpty()) {
+            if (urls.isEmpty()) {
                 throw new ServletException("Unable to install sample applicatoin; unable to download repository list");
             }
         }

Modified: geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml Fri Jan  4 16:47:14 2008
@@ -42,14 +42,6 @@
 
     <dependencies>
         
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>jetty-deployer</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-welcome</artifactId>
@@ -75,6 +67,12 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml Fri Jan  4 16:47:14 2008
@@ -69,6 +69,12 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>plugin</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
 
     </dependencies>
     

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Fri Jan  4 16:47:14 2008
@@ -52,6 +52,7 @@
     load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-deploy-jsr88/2.1-SNAPSHOT/geronimo-deploy-jsr88-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-deploy-tool/2.1-SNAPSHOT/geronimo-deploy-tool-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-system/2.1-SNAPSHOT/geronimo-system-*.jar
+    load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-plugin/2.1-SNAPSHOT/geronimo-plugin-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/modules/geronimo-common/2.1-SNAPSHOT/geronimo-common-*.jar
     load ${gshell.home}/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-*.jar
     load ${gshell.home}/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-*.jar

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Fri Jan  4 16:47:14 2008
@@ -59,20 +59,28 @@
             <type>car</type>
         </dependency>
         
+<!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>upgrade-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+-->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>plugin</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
@@ -94,33 +102,41 @@
             <type>car</type>
         </dependency>
         
+<!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+-->
+
+<!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>offline-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+-->
+
+<!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
- 
+-->
+
+<!--
          <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-deploymentfactory</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+-->
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Fri Jan  4 16:47:14 2008
@@ -52,7 +52,6 @@
             <version>${version}</version>
         </dependency>
         
-        <!-- needed by the plan -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deployment</artifactId>
@@ -65,20 +64,13 @@
             <version>${version}</version>
         </dependency>
         
-        <!-- required for environment dconfigbean support -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        </dependency>
-
-        <!-- jsr88 dconfigbean support base classes -->
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>plugin</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
-        <!-- build order hint -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
@@ -102,9 +94,47 @@
 
                     <category>Geronimo Core</category>
                     <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
+                        <value>false</value>
                     </useMavenDependencies>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>xmlbeans</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-common</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <!-- needed by the plan -->
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deployment</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-service-builder</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>plugin</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+
+                    </dependencies>
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>

Copied: geronimo/server/trunk/framework/configs/plugin/pom.xml (from r609071, geronimo/server/trunk/framework/configs/rmi-naming/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?p2=geronimo/server/trunk/framework/configs/plugin/pom.xml&p1=geronimo/server/trunk/framework/configs/rmi-naming/pom.xml&r1=609071&r2=609072&rev=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Fri Jan  4 16:47:14 2008
@@ -29,79 +29,60 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>rmi-naming</artifactId>
-    <name>Geronimo Configs :: RMI Naming</name>
+    <artifactId>plugin</artifactId>
+    <name>Geronimo Configs :: Plugin Management</name>
     <packaging>car</packaging>
 
-    <description>Fundamental geronimo services including the plugin installer.</description>
+    <description>Plugin management services including the installer.</description>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-system</artifactId>
+            <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jee-specs</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <!-- thread pool has management interface -->
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-core</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-interceptor</artifactId>
+            <artifactId>geronimo-plugin</artifactId>
             <version>${version}</version>
         </dependency>
 
+        <!-- not sure about this one - provides remote access -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming</artifactId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-util</artifactId>
+            <artifactId>geronimo-deploy-config</artifactId>
             <version>${version}</version>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-naming</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
-
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
+                    </deploymentConfigs>
+                    <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
                     <category>Geronimo Core</category>
                     <useMavenDependencies>
                         <value>true</value>
@@ -110,29 +91,11 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>
-                                <gbean name="RMIRegistry">
-                                    <attribute name="port">${NamingPort + PortOffset}</attribute>
-                                </gbean>
-                                <gbean name="NamingProperties">
-                                    <!-- Check whether this really works if host name is 0.0.0.0 -->
-                                    <attribute name="namingProviderUrl">rmi://${ServerHostname}:${NamingPort + PortOffset}</attribute>
-                                </gbean>
-                                <gbean name="DefaultThreadPool">
-                                    <attribute name="keepAliveTime">30000</attribute>
-                                    <attribute name="minPoolSize">${MinThreadPoolSize}</attribute>
-                                    <attribute name="maxPoolSize">${MaxThreadPoolSize}</attribute>
-
-                                </gbean>
                                 <gbean name="DownloadedPluginRepos">
                                     <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
                                     <attribute name="userRepositories">~/.m2/repository</attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-substitution key="ServerHostname">localhost</config-substitution>
-                            <config-substitution key="PortOffset">0</config-substitution>
-                            <config-substitution key="NamingPort">1099</config-substitution>
-                            <config-substitution key="MinThreadPoolSize">200</config-substitution>
-                            <config-substitution key="MaxThreadPoolSize">500</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml Fri Jan  4 16:47:14 2008
@@ -20,44 +20,6 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
-        <attribute name="port">${PlanNamingPort}</attribute>
-    </gbean>
-
-    <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
-        <attribute name="namingFactoryInitial">org.apache.xbean.naming.global.GlobalContextManager</attribute>
-        <attribute name="namingFactoryUrlPkgs">org.apache.xbean.naming</attribute>
-        <attribute name="namingProviderUrl">rmi://localhost:1099</attribute>
-    </gbean>
-
-    <gbean name="GlobalContext" class="org.apache.geronimo.gjndi.GlobalContextGBean"/>
-
-    <gbean name="JavaCompContext" class="org.apache.geronimo.gjndi.JavaCompContextGBean"/>
-
-    <gbean name="JavaContext" class="org.apache.geronimo.gjndi.WritableContextGBean">
-        <attribute name="nameInNamespace">java:</attribute>
-    </gbean>
-
-    <gbean name="GeronimoContext" class="org.apache.geronimo.gjndi.WritableContextGBean">
-        <attribute name="nameInNamespace">ger:</attribute>
-    </gbean>
-
-    <gbean name="MBeanServerReference" class="org.apache.geronimo.system.jmx.RealMBeanServerReference"/>
-
-    <!-- MBean server service -->
-    <gbean name="MBeanServerKernelBridge" class="org.apache.geronimo.system.jmx.MBeanServerKernelBridge">
-        <reference name="MBeanServerReference">
-            <name>MBeanServerReference</name>
-        </reference>
-    </gbean>
-
-    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
-        <attribute name="keepAliveTime">30000</attribute>
-        <attribute name="minPoolSize">200</attribute>
-        <attribute name="maxPoolSize">500</attribute>
-        <attribute name="poolName">DefaultThreadPool</attribute>
-    </gbean>
-
     <!-- Configuration Installer -->
     <gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
         <reference name="Repository">

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Fri Jan  4 16:47:14 2008
@@ -126,6 +126,7 @@
         <module>offline-deployer</module>
         <module>online-deployer</module>
         <module>rmi-naming</module>
+        <module>plugin</module>
         <module>server-security-config</module>
         <module>shutdown</module>
         <module>upgrade-cli</module>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Fri Jan  4 16:47:14 2008
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -102,6 +102,10 @@
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
+                    </deploymentConfigs>
+                    <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
                     <category>Geronimo Core</category>
                     <useMavenDependencies>
                         <value>true</value>
@@ -122,10 +126,6 @@
                                     <attribute name="minPoolSize">${MinThreadPoolSize}</attribute>
                                     <attribute name="maxPoolSize">${MaxThreadPoolSize}</attribute>
 
-                                </gbean>
-                                <gbean name="DownloadedPluginRepos">
-                                    <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
-                                    <attribute name="userRepositories">~/.m2/repository</attribute>
                                 </gbean>
                             </config-xml-content>
                             <config-substitution key="ServerHostname">localhost</config-substitution>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Fri Jan  4 16:47:14 2008
@@ -58,86 +58,4 @@
         <attribute name="poolName">DefaultThreadPool</attribute>
     </gbean>
 
-    <!-- Configuration Installer -->
-    <gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
-        <reference name="Repository">
-            <name>Repository</name>
-        </reference>
-        <reference name="ConfigStore">
-            <name>Local</name>
-        </reference>
-        <reference name="ConfigManager">
-            <name>ConfigurationManager</name>
-        </reference>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <reference name="ThreadPool">
-            <name>DefaultThreadPool</name>
-        </reference>
-        <references name="ServerInstances">
-            <pattern>
-                <name>DefaultServer</name>
-            </pattern>
-            <pattern>
-                <name>Offline</name>
-            </pattern>
-            <pattern>
-                <name>Client</name>
-            </pattern>
-            <pattern>
-                <name>Jsr88</name>
-            </pattern>
-        </references>
-        <references name="PersistentConfigurationLists">
-            <pattern>
-                <name>AttributeManager</name>
-            </pattern>
-        </references>
-    </gbean>
-
-    <gbean name="DefaultServer" class="org.apache.geronimo.system.plugin.ReferenceServerInstanceData">
-        <attribute name="name">default</attribute>
-        <reference name="AttributeStore">
-            <name>AttributeManager</name>
-        </reference>
-        <reference name="ArtifactResolver">
-            <name>ArtifactResolver</name>
-        </reference>
-    </gbean>
-
-    <gbean name="Offline" class="org.apache.geronimo.system.plugin.ServerInstanceData">
-        <attribute name="name">offline</attribute>
-        <attribute name="configFile">var/config/offline-deployer-config.xml</attribute>
-        <attribute name="configSubstitutionsFileName">var/config/config-substitutions.properties</attribute>
-        <attribute name="configSubstitutionsPrefix">org.apache.geronimo.config.substitution.</attribute>
-        <attribute name="artifactAliasesFileName">var/config/artifact_aliases.properties</attribute>
-    </gbean>
-
-    <gbean name="Client" class="org.apache.geronimo.system.plugin.ServerInstanceData">
-        <attribute name="name">client</attribute>
-        <attribute name="attributeManagerFrom">default</attribute>
-        <attribute name="artifactAliasesFileName">var/config/client_artifact_aliases.properties</attribute>
-        <dependency><name>DefaultServer</name></dependency>
-    </gbean>
-
-    <gbean name="Jsr88" class="org.apache.geronimo.system.plugin.ServerInstanceData">
-        <attribute name="name">jsr88</attribute>
-        <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
-        <attribute name="configSubstitutionsFileName">var/config/config-substitutions.properties</attribute>
-        <attribute name="configSubstitutionsPrefix">org.apache.geronimo.config.substitution.</attribute>
-        <attribute name="artifactAliasesFileName">var/config/artifact_aliases.properties</attribute>
-    </gbean>
-
-    <gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
-        <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
-        <attribute name="userRepositories">~/.m2/repository</attribute>
-    </gbean>
-
-    <gbean name="Archiver" class="org.apache.geronimo.system.plugin.ArchiverGBean">
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-    </gbean>
-
 </module>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml Fri Jan  4 16:47:14 2008
@@ -39,6 +39,11 @@
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java Fri Jan  4 16:47:14 2008
@@ -45,8 +45,6 @@
 import org.apache.geronimo.management.geronimo.WebModule;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.apache.geronimo.system.plugin.PluginInstaller;
-import org.apache.geronimo.system.plugin.PluginRepositoryList;
 
 /**
  * @version $Rev$ $Date$
@@ -67,11 +65,9 @@
     private final Collection jmsManagers;
     private final Collection threadPools;
     private final Collection repositories;
-    private final Collection pluginRepoLists;
     private final Collection writableRepos;
     private final Collection securityRealms;
     private final Collection keystoreManagers;
-    private final Collection pluginInstallers;
     private final ConfigurationManager configurationManager;
 
     public J2EEServerImpl(String objectName,
@@ -91,9 +87,7 @@
                           Collection writableRepos,
                           Collection securityRealms,
                           Collection keystoreManagers,
-                          Collection configurationInstallers,
-                          ConfigurationManager configurationManager,
-                          Collection pluginRepoLists) {
+                          ConfigurationManager configurationManager) {
 
         this.objectName = objectName;
         ObjectName myObjectName = ObjectNameUtil.getObjectName(this.objectName);
@@ -118,9 +112,7 @@
         this.writableRepos = writableRepos;
         this.securityRealms = securityRealms;
         this.keystoreManagers = keystoreManagers;
-        this.pluginInstallers = configurationInstallers;
         this.configurationManager = configurationManager;
-        this.pluginRepoLists = pluginRepoLists;
     }
 
     public String getObjectName() {
@@ -266,11 +258,6 @@
         return (SecurityRealm[]) securityRealms.toArray(new SecurityRealm[securityRealms.size()]);
     }
 
-    public PluginRepositoryList[] getPluginRepositoryLists() {
-        if (pluginRepoLists == null) return new PluginRepositoryList[0];
-        return (PluginRepositoryList[]) pluginRepoLists.toArray(new PluginRepositoryList[pluginRepoLists.size()]);
-    }
-
     public ServerInfo getServerInfo() {
         return serverInfo;
     }
@@ -280,13 +267,6 @@
         return (KeystoreManager) keystoreManagers.iterator().next();
     }
 
-    public PluginInstaller getPluginInstaller() {
-        if (pluginInstallers.isEmpty()) {
-            return null;
-        }
-        return (PluginInstaller) pluginInstallers.iterator().next();
-    }
-
     public ConfigurationManager getConfigurationManager() {
         return configurationManager;
     }
@@ -320,8 +300,6 @@
         infoFactory.addReference("WritableRepos", WritableListableRepository.class);
         infoFactory.addReference("SecurityRealms", SecurityRealm.class);
         infoFactory.addReference("KeystoreManagers", KeystoreManager.class);
-        infoFactory.addReference("PluginInstaller", PluginInstaller.class);
-        infoFactory.addReference("PluginRepoLists", PluginRepositoryList.class);
         infoFactory.addReference("ConfigurationManager", ConfigurationManager.class);
 
         infoFactory.setConstructor(new String[]{
@@ -342,9 +320,7 @@
                 "WritableRepos",
                 "SecurityRealms",
                 "KeystoreManagers",
-                "PluginInstaller",
                 "ConfigurationManager",
-                "PluginRepoLists",
         });
 
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/server/trunk/framework/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java Fri Jan  4 16:47:14 2008
@@ -39,8 +39,6 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
-import org.apache.geronimo.system.plugin.PluginInstaller;
-import org.apache.geronimo.system.plugin.PluginRepositoryList;
 import org.apache.geronimo.management.J2EEResource;
 import org.apache.geronimo.management.EJBModule;
 import org.apache.geronimo.management.AppClientModule;
@@ -119,8 +117,6 @@
         SERVER_DATA.setReferencePatterns("ResourceAdapterModules", new ReferencePatterns(new AbstractNameQuery(ResourceAdapterModule.class.getName())));
         SERVER_DATA.setReferencePatterns("WebModules", new ReferencePatterns(new AbstractNameQuery(WebModule.class.getName())));
         // Can't test, there are none of these available
-        //SERVER_DATA.setReferencePatterns("PluginInstaller", new ReferencePatterns(new AbstractNameQuery(PluginInstaller.class.getName())));
-        SERVER_DATA.setReferencePatterns("PluginRepoLists", new ReferencePatterns(new AbstractNameQuery(PluginRepositoryList.class.getName())));
         kernel.loadGBean(SERVER_DATA, classLoader);
 
         // JVM

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Fri Jan  4 16:47:14 2008
@@ -349,6 +349,8 @@
                 }
             }
             throw new InvalidConfigurationException(buf.toString());
+        } catch (NoClassDefFoundError e) {
+            throw new InvalidConfigurationException(e);
         }
 
         // rebuild the gbean info based on the current attributes, operations, and references because

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ManageableAttributeStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ManageableAttributeStore.java?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ManageableAttributeStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ManageableAttributeStore.java Fri Jan  4 16:47:14 2008
@@ -49,7 +49,7 @@
      * @return                  The modified GBeanData's
      * @throws InvalidConfigException If something bad happens
      */
-    public Collection applyOverrides(Artifact configurationName, Collection datas, ClassLoader classLoader) throws InvalidConfigException;
+    public Collection applyOverrides(Artifact configurationName, Collection<GBeanData> datas, ClassLoader classLoader) throws InvalidConfigException;
 
     /**
      * Sets the stored value for a particular attribute.  The attribute is

Modified: geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java?rev=609072&r1=609071&r2=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java Fri Jan  4 16:47:14 2008
@@ -25,8 +25,6 @@
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.apache.geronimo.system.plugin.PluginInstaller;
-import org.apache.geronimo.system.plugin.PluginRepositoryList;
 
 /**
  * Geronimo-specific extensions to the standard J2EE server management
@@ -103,16 +101,6 @@
      * Gets the KeystoreManager associated with this J2EEServer.
      */
     public KeystoreManager getKeystoreManager();
-
-    /**
-     * Gets the lists of plugin repositories available in this server.
-     */
-    public PluginRepositoryList[] getPluginRepositoryLists();
-
-    /**
-     * Gets the PluginInstaller associated with this J2EEServer.
-     */
-    public PluginInstaller getPluginInstaller();
 
     /**
      * Gets the ConfigurationManager associated with this J2EEServer.

Added: geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt?rev=609072&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt (added)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt Fri Jan  4 16:47:14 2008
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt?rev=609072&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt (added)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt Fri Jan  4 16:47:14 2008
@@ -0,0 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml?rev=609072&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml (added)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml Fri Jan  4 16:47:14 2008
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<project>
+    <parent>
+        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <version>2.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-plugin</artifactId>
+    <name>geronimo-plugin</name>
+    <version>2.1-SNAPSHOT</version>
+    <url>http://maven.apache.org</url>
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- archiver seems to need to be same version as maven uses ??? -->
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-archiver</artifactId>
+        </dependency>
+
+    </dependencies>
+
+<!--
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>xjc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <packageName>org.apache.geronimo.system.plugin.model</packageName>
+                    <extension>true</extension>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+-->
+</project>

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java (from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java?p2=geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java&p1=geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java&r1=609071&r2=609072&rev=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalOpenResult.java Fri Jan  4 16:47:14 2008
@@ -28,7 +28,7 @@
 import org.apache.geronimo.kernel.repository.WriteableRepository;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 class LocalOpenResult implements OpenResult {
     private final Artifact artifact;

Copied: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java (from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java?p2=geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java&p1=geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java&r1=609071&r2=609072&rev=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java Fri Jan  4 16:47:14 2008
@@ -36,7 +36,7 @@
 import org.apache.geronimo.system.plugin.model.PluginListType;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class LocalSourceRepository extends Maven2Repository implements SourceRepository {
 

Copied: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java (from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java?p2=geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java&p1=geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java&r1=609071&r2=609072&rev=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NoServerInstanceException.java Fri Jan  4 16:47:14 2008
@@ -21,7 +21,7 @@
 package org.apache.geronimo.system.plugin;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class NoServerInstanceException extends Exception {
 

Copied: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java (from r609071, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java?p2=geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java&p1=geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java&r1=609071&r2=609072&rev=609072&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/OpenResult.java Fri Jan  4 16:47:14 2008
@@ -28,7 +28,7 @@
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface OpenResult {
     Artifact getArtifact();



Mime
View raw message