geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r566146 - in /geronimo/sandbox/portals/plugins: console/trunk/ console/trunk/console-base-portlets/ console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/ console/trunk/console-base-portlets/src/main/java/org/apache/...
Date Wed, 15 Aug 2007 13:43:26 GMT
Author: pmcmahan
Date: Wed Aug 15 06:43:23 2007
New Revision: 566146

URL: http://svn.apache.org/viewvc?view=rev&rev=566146
Log:
GERONIMO-3413 move the resuable console classes such as the multi-page portlet handlers into a separate jar.
create a plugin for the plan creator portlet, copied from trunk.

Added:
    geronimo/sandbox/portals/plugins/console/trunk/console-core/
      - copied from r565841, geronimo/server/trunk/applications/console/geronimo-console-core/
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/BasePortlet.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/EmptyPortlet.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/EmptyPortlet.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/MultiPageModel.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/MultiPageModel.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/CollectionHelper.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/CollectionHelper.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/KernelHelper.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/KernelHelper.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/ObjectNameConstants.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/ObjectNameConstants.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java
      - copied, changed from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/StringTree.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/StringTree.java
    geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/StringUtils.java
      - copied unchanged from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/StringUtils.java
    geronimo/sandbox/portals/plugins/plancreator/
    geronimo/sandbox/portals/plugins/plancreator/trunk/
    geronimo/sandbox/portals/plugins/plancreator/trunk/LICENSE.txt
      - copied unchanged from r565881, geronimo/sandbox/portals/plugins/console/trunk/LICENSE.txt
    geronimo/sandbox/portals/plugins/plancreator/trunk/NOTICE.txt
      - copied unchanged from r565881, geronimo/sandbox/portals/plugins/console/trunk/NOTICE.txt
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/LICENSE.txt
      - copied unchanged from r565882, geronimo/sandbox/portals/plugins/console/trunk/LICENSE.txt
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/NOTICE.txt
      - copied unchanged from r565882, geronimo/sandbox/portals/plugins/console/trunk/NOTICE.txt
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml   (with props)
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/java/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/java/org/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/java/org/apache/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/java/org/apache/geronimo/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/java/org/apache/geronimo/console/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/
      - copied from r565841, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configcreator/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml   (with props)
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/view/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/
      - copied from r565841, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configcreator/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/LICENSE.txt
      - copied unchanged from r565892, geronimo/sandbox/portals/plugins/console/trunk/LICENSE.txt
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/NOTICE.txt
      - copied unchanged from r565891, geronimo/sandbox/portals/plugins/console/trunk/NOTICE.txt
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/pom.xml
      - copied, changed from r565493, geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
      - copied, changed from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/
    geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml   (with props)
    geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml
      - copied, changed from r565881, geronimo/sandbox/portals/plugins/console/trunk/pom.xml
Removed:
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/BasePortlet.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/EmptyPortlet.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/MultiPageModel.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/CollectionHelper.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/KernelHelper.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/ObjectNameConstants.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/StringTree.java
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/StringUtils.java
Modified:
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-core/pom.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/console/trunk/pom.xml

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml?view=diff&rev=566146&r1=566145&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml Wed Aug 15 06:43:23 2007
@@ -74,19 +74,14 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.applications.console</groupId>
-            <artifactId>geronimo-console-core</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
         </dependency>
         
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
             <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-core/pom.xml?view=diff&rev=566146&r1=565841&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-core/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-core/pom.xml Wed Aug 15 06:43:23 2007
@@ -21,28 +21,47 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
-        <groupId>org.apache.geronimo.applications.console</groupId>
+        <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-console-core</artifactId>
-    <name>Geronimo Applications, Console :: Core</name>
+    <artifactId>console-core</artifactId>
+    <name>Geronimo Administration Console Plugin :: Core Classes</name>
     
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
-            <version>${version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         
     </dependencies>

Copied: geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java (from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/PortletManager.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java?view=diff&rev=566146&p1=geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/PortletManager.java&r1=564771&p2=geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java Wed Aug 15 06:43:23 2007
@@ -41,7 +41,9 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Repository;
@@ -107,6 +109,10 @@
             log.error(e.getMessage(), e);
             return null;
         }
+    }
+
+    public static ConfigurationManager getConfigurationManager() {
+        return ConfigurationUtil.getConfigurationManager(getKernel());
     }
 
     public static ManagementHelper getManagementHelper(PortletRequest request) {

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=566146&r1=566145&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml Wed Aug 15 06:43:23 2007
@@ -41,9 +41,16 @@
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>
+    <prerequisite>
+        <id>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</id>
+        <resource-type>Portlet Container</resource-type>
+        <description>
+            The pluto container configuration must be present in order for this
+            plugin to register the web application context for its management portlets.
+        </description>
+    </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.configs/jee-specs/2.1-SNAPSHOT/car</dependency>
-    <dependency>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</dependency>
     <dependency>org.apache.pluto/pluto-portal-driver/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-portal-driver-impl/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-container/1.2.0-SNAPSHOT/jar</dependency>

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=566146&r1=566145&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Wed Aug 15 06:43:23 2007
@@ -41,9 +41,16 @@
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>
+    <prerequisite>
+        <id>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</id>
+        <resource-type>Portlet Container</resource-type>
+        <description>
+            The pluto container configuration must be present in order for this
+            plugin to register the web application context for its management portlets.
+        </description>
+    </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.configs/jee-specs/2.1-SNAPSHOT/car</dependency>
-    <dependency>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</dependency>
     <dependency>org.apache.pluto/pluto-portal-driver/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-portal-driver-impl/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-container/1.2.0-SNAPSHOT/jar</dependency>
@@ -60,14 +67,6 @@
     <dependency>org.springframework/spring-context/2.0.2/jar</dependency>
     <dependency>org.springframework/spring-core/2.0.2/jar</dependency>
     <dependency>org.springframework/spring-web/2.0.2/jar</dependency>
-
-<!--  pom.xml has this dep, is it needed here?
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
--->
-
     <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
     <source-repository>http://repo1.maven.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/sandbox/portals/plugins/console/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/pom.xml?view=diff&rev=566146&r1=566145&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/pom.xml Wed Aug 15 06:43:23 2007
@@ -240,6 +240,36 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-connector</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-management</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee-builder</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deployment</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jms_1.1_spec</artifactId>
+                <version>1.1</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.codehaus.castor</groupId>
                 <artifactId>castor</artifactId>
                 <version>1.1.1</version>
@@ -305,37 +335,43 @@
                 <version>${springVersion}</version>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-kernel</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-security</artifactId>
                 <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-upgrade</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-converter</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-connector-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
+             <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-web-2.5-builder</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-security-builder</artifactId>
@@ -344,19 +380,46 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-connector-builder</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-security</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-deploy-jsr88</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
              <dependency>
-                <groupId>org.apache.geronimo.applications.console</groupId>
-                <artifactId>geronimo-console-core</artifactId>
-                <version>${geronimoVersion}</version>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>console-core</artifactId>
+                <version>${version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-connector</artifactId>
                     </exclusion>
+
+                   <exclusion>
+                       <groupId>javax.portlet</groupId>
+                       <artifactId>portlet-api</artifactId>
+                   </exclusion>
+
+                   <exclusion>
+                       <groupId>org.apache.geronimo.modules</groupId>
+                       <artifactId>geronimo-deploy-jsr88</artifactId>
+                   </exclusion>
+
+                   <exclusion>
+                       <groupId>org.apache.geronimo.specs</groupId>
+                       <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                   </exclusion>
                 </exclusions>
             </dependency>
 
@@ -528,6 +591,7 @@
             </activation>
 
             <modules>
+                <module>console-core</module>
                 <module>console-base-portlets</module>
                 <module>console-portal-driver</module>
                 <module>console-ear</module>

Added: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml?view=auto&rev=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml (added)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml Wed Aug 15 06:43:23 2007
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plancreator</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>plancreator-portlets</artifactId>
+    <name>Geronimo Plan Creator :: Admin Console Portlets</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+    </dependencies>
+    
+  <!-- Build configuration -->
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
+    
+</project>

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml?view=auto&rev=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml (added)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Aug 15 06:43:23 2007
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<portlet-app version="1.0">
+
+     <portlet>
+        <description>Portlet for creating Geronimo Deployment Plan</description>
+        <portlet-name>PlanCreator</portlet-name>
+        <display-name>Create Deployment Plan Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.configcreator.CreatePlanPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Create Geronimo Deployment Plan</title>
+            <short-title>Create Deployment Plan</short-title>
+            <keywords>Create Deployment Plan</keywords>
+        </portlet-info>
+    </portlet>
+
+</portlet-app>

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml?view=auto&rev=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml Wed Aug 15 06:43:23 2007
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" metadata-complete="true">
+    <display-name>Geronimo Plan Creator Portlet</display-name>
+
+    <servlet>
+        <servlet-name>PlanCreator</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>PlanCreator</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>PlanCreator</servlet-name>
+        <url-pattern>/PlutoInvoker/PlanCreator</url-pattern>
+    </servlet-mapping>
+
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>plancreator</web-resource-name>
+            <url-pattern>/</url-pattern>
+            <http-method>GET</http-method>
+            <http-method>POST</http-method>
+            <http-method>PUT</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>admin</role-name>
+        </auth-constraint>
+    </security-constraint>
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>geronimo-admin</realm-name>
+    </login-config>
+    <security-role>
+        <role-name>admin</role-name>
+    </security-role>
+
+</web-app>

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/pom.xml (from r565493, geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/pom.xml?view=diff&rev=566146&p1=geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml&r1=565493&p2=geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/pom.xml&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/pom.xml Wed Aug 15 06:43:23 2007
@@ -24,23 +24,23 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console</artifactId>
+        <artifactId>plancreator</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>console-tomcat</artifactId>
-    <name>Geronimo Administration Console Plugin :: Configuration for Tomcat</name>
+    <artifactId>plancreator-tomcat</artifactId>
+    <name>Geronimo Plan Creator :: Configuration for Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-ear</artifactId>
+            <artifactId>plancreator-portlets</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
         </dependency>
 
         <dependency>
@@ -51,20 +51,29 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>connector-deployer</artifactId>
             <type>car</type>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
         </dependency>
 
-	<dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <type>car</type>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
         </dependency>
 
     </dependencies>
@@ -90,8 +99,8 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>console-ear</artifactId>
-                        <type>ear</type>
+                        <artifactId>plancreator-portlets</artifactId>
+                        <type>war</type>
                     </module>
                 </configuration>
             </plugin>

Copied: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=566146&p1=geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml&r1=564771&p2=geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Wed Aug 15 06:43:23 2007
@@ -19,11 +19,11 @@
 <!-- $Rev$ $Date$ -->
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-    <name>Administration Console -- Tomcat</name>
-    <module-id>org.apache.geronimo.plugins/console-tomcat/1.0-SNAPSHOT/car</module-id>
+    <name>Plan Creator -- Tomcat</name>
+    <module-id>org.apache.geronimo.plugins/plancreator-tomcat/1.0-SNAPSHOT/car</module-id>
     <category>Application</category>
     <description>
-       Geronimo Administration Console for Tomcat
+       Geronimo Plan Creator for Tomcat
     </description>
 
     <url>http://geronimo.apache.org/</url>
@@ -41,33 +41,17 @@
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>
+    <prerequisite>
+        <id>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</id>
+        <resource-type>Portlet Container</resource-type>
+        <description>
+            The pluto container configuration must be present in order for this
+            plugin to register the web application context for its management portlets.
+        </description>
+    </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.configs/jee-specs/2.1-SNAPSHOT/car</dependency>
-    <dependency>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</dependency>
-    <dependency>org.apache.pluto/pluto-portal-driver/1.2.0-SNAPSHOT/jar</dependency>
-    <dependency>org.apache.pluto/pluto-portal-driver-impl/1.2.0-SNAPSHOT/jar</dependency>
-    <dependency>org.apache.pluto/pluto-container/1.2.0-SNAPSHOT/jar</dependency>
-    <dependency>org.apache.pluto/pluto-descriptor-api/1.2.0-SNAPSHOT/jar</dependency>
-    <dependency>org.apache.pluto/pluto-descriptor-impl/1.2.0-SNAPSHOT/jar</dependency>
-    <dependency>org.apache.pluto/pluto-taglib/1.2.0-SNAPSHOT/jar</dependency>
-    <dependency>commons-logging/commons-logging-api/1.0.4/jar</dependency>
-    <dependency>commons-beanutils/commons-beanutils/1.7.0/jar</dependency>
-    <dependency>javax.portlet/portlet-api/1.0/jar</dependency>
-    <dependency>org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1-SNAPSHOT/jar</dependency>
-    <dependency>org.codehaus.castor/castor/1.1.1/jar</dependency>
-    <dependency>commons-digester/commons-digester/1.8/jar</dependency>
-    <dependency>org.springframework/spring-beans/2.0.2/jar</dependency>
-    <dependency>org.springframework/spring-context/2.0.2/jar</dependency>
-    <dependency>org.springframework/spring-core/2.0.2/jar</dependency>
-    <dependency>org.springframework/spring-web/2.0.2/jar</dependency>
-
-<!--  pom.xml has this dep, is it needed here?
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
--->
-
+    <dependency>org.apache.geronimo.plugins/console-core/1.0-SNAPSHOT/jar</dependency>
     <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
     <source-repository>http://repo1.maven.org/maven2/</source-repository>
 </geronimo-plugin>

Added: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml?view=auto&rev=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml (added)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml Wed Aug 15 06:43:23 2007
@@ -0,0 +1,42 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+    
+    <!-- This is where the files are accessed from. (aka - portletContext) -->
+    <context-root>/PlanCreator</context-root>
+
+    <!-- required for pluto cross context dispatches -->
+    <cross-context />
+
+    <security-realm-name>geronimo-admin</security-realm-name>
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
+        <role-mappings>
+            <role role-name="admin">
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
+            </role>
+        </role-mappings>
+    </security>
+    
+    <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
+    <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Applications/Plan Creator</attribute>
+        <attribute name="portletContext">/PlanCreator</attribute>
+        <attribute name="portletList">[PlanCreator]</attribute>
+    </gbean>
+</web-app>

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml (from r565881, geronimo/sandbox/portals/plugins/console/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml?view=diff&rev=566146&p1=geronimo/sandbox/portals/plugins/console/trunk/pom.xml&r1=565881&p2=geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml&r2=566146
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/plancreator/trunk/pom.xml Wed Aug 15 06:43:23 2007
@@ -29,20 +29,20 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>console</artifactId>
-    <name>Geronimo Administration Console Plugin</name>
+    <artifactId>plancreator</artifactId>
+    <name>Geronimo Plan Creator</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
 
     <description>
-        Geronimo administration console supporting dynamic extensions
+        Geronimo plan creator
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/console/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/console/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/console/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/plancreator/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/plancreator/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk</url>
     </scm>
 
     <properties>
@@ -56,9 +56,8 @@
         -->
         <version>1.0-SNAPSHOT</version>
         <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-        <junitVersion>3.8.2</junitVersion>
         <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
-        <springVersion>2.0.2</springVersion>
+        <consoleVersion>1.0-SNAPSHOT</consoleVersion>
 
         <!-- deployers needed to create the CAR files -->
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
@@ -72,273 +71,82 @@
         <dependencies>
 
             <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-portal-driver</artifactId>
-                <version>${plutoVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jstl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>taglibs</groupId>
-                        <artifactId>standard</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jsp-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-web</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-portal-driver-impl</artifactId>
-                <version>${plutoVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jstl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>taglibs</groupId>
-                        <artifactId>standard</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jsp-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-web</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <artifactId>junit</artifactId>
-                <groupId>junit</groupId>
-                <version>${junitVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-container</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-taglib</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>javax.portlet</groupId>
                 <artifactId>portlet-api</artifactId>
                 <version>1.0</version>
             </dependency>
 
             <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>1.8</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>1.7.0</version>
-            </dependency>
-
-            <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging-api</artifactId>
                 <version>1.0.4</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-descriptor-impl</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-descriptor-api</artifactId>
-                <version>${plutoVersion}</version>
+             <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-kernel</artifactId>
+                <version>${geronimoVersion}</version>
             </dependency>
 
-            <dependency>
+             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jee-specs</artifactId>
+                <artifactId>j2ee-security</artifactId>
                 <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
 
-            <dependency>
+             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
+                <artifactId>connector-deployer</artifactId>
                 <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.1-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-core</artifactId>
-                <version>4.1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
-           <dependency>
-                <groupId>org.directwebremoting</groupId>
-                <artifactId>dwr</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-beans</artifactId>
-                <version>${springVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>${springVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${springVersion}</version>
+             <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deployment</artifactId>
+                <version>${geronimoVersion}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${springVersion}</version>
+             <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-test-ddbean</artifactId>
+                <version>${geronimoVersion}</version>
             </dependency>
 
              <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-kernel</artifactId>
+                <artifactId>geronimo-connector-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
              <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-naming-builder</artifactId>
                 <version>${geronimoVersion}</version>
-                <type>car</type>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-upgrade</artifactId>
+                <artifactId>geronimo-security-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-converter</artifactId>
+                <artifactId>geronimo-management</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector-builder</artifactId>
+                <artifactId>geronimo-j2ee-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security-builder</artifactId>
+                <artifactId>geronimo-web-2.5-builder</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
@@ -348,15 +156,30 @@
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
-                <groupId>org.apache.geronimo.applications.console</groupId>
-                <artifactId>geronimo-console-core</artifactId>
-                <version>${geronimoVersion}</version>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>console-core</artifactId>
+                <version>${consoleVersion}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-connector</artifactId>
                     </exclusion>
+
+                    <exclusion>
+                        <groupId>javax.portlet</groupId>
+                        <artifactId>portlet-api</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-deploy-jsr88</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -528,11 +351,11 @@
             </activation>
 
             <modules>
-                <module>console-base-portlets</module>
-                <module>console-portal-driver</module>
-                <module>console-ear</module>
-                <module>console-tomcat</module>
-                <module>console-jetty</module>
+                <module>plancreator-portlets</module>
+                <module>plancreator-tomcat</module>
+<!--
+                <module>plancreator-jetty</module>
+-->
             </modules>
         </profile>
     </profiles>



Mime
View raw message