geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r675240 - in /geronimo/server/trunk: framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/ framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/ framework/module...
Date Wed, 09 Jul 2008 15:59:22 GMT
Author: jbohn
Date: Wed Jul  9 08:59:21 2008
New Revision: 675240

URL: http://svn.apache.org/viewvc?rev=675240&view=rev
Log:
remove unncessary moduleIds in console plans and update geronimo plugin/upgrade tests to use
more current snapshot versions

Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1.xml
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml?rev=675240&r1=675239&r2=675240&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
Wed Jul  9 08:59:21 2008
@@ -25,7 +25,7 @@
     <moduleId>
       <groupId>org.apache.geronimo.buildsupport.it</groupId>
       <artifactId>j2ee-system</artifactId>
-      <version>2.1.1-SNAPSHOT</version>
+      <version>2.2-SNAPSHOT</version>
       <type>car</type>
     </moduleId>
     <dependencies>
@@ -46,7 +46,7 @@
       <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-common</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>
@@ -60,7 +60,7 @@
       <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-crypto</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>
@@ -123,7 +123,7 @@
       <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-system</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml?rev=675240&r1=675239&r2=675240&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
Wed Jul  9 08:59:21 2008
@@ -26,7 +26,7 @@
         <module-id>
             <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>car-maven-plugin</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.2-SNAPSHOT</version>
             <type>jar</type>
         </module-id>
         <jvm-version>1.5</jvm-version>
@@ -53,7 +53,7 @@
         <dependency start="false">
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.2-SNAPSHOT</version>
         </dependency>
         <obsoletes>
             <groupId>commons-logging</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=675240&r1=675239&r2=675240&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
Wed Jul  9 08:59:21 2008
@@ -25,11 +25,11 @@
             <module-id>
                 <groupId>geronimo</groupId>
                 <artifactId>daytrader-derby-jetty</artifactId>
-                <version>1.2-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-versions>
-                <version>1.2-SNAPSHOT</version>
+                <version>2.2-SNAPSHOT</version>
             </geronimo-versions>
             <prerequisite>
                 <id>
@@ -45,8 +45,8 @@
                     from another Tomcat Geronimo installation.
                 </description>
             </prerequisite>
-            <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-            <dependency>geronimo/geronimo-daytrader-derby-db/1.2-SNAPSHOT/jar</dependency>
+            <dependency>geronimo/j2ee-server/2.2-SNAPSHOT/car</dependency>
+            <dependency>geronimo/geronimo-daytrader-derby-db/2.0-SNAPSHOT/jar</dependency>
         </plugin-artifact>
     </plugin>
 
@@ -58,11 +58,11 @@
             <module-id>
                 <groupId>geronimo</groupId>
                 <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
-                <version>1.2-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <type>car</type>
             </module-id>
             <geronimo-versions>
-                <version>1.2-SNAPSHOT</version>
+                <version>2.2-SNAPSHOT</version>
             </geronimo-versions>
             <prerequisite>
                 <id>
@@ -81,225 +81,12 @@
             <dependency>
                 <groupId>geronimo</groupId>
                 <artifactId>client</artifactId>
-                <version>1.2-SNAPSHOT</version>
+                <version>2.2-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
         </plugin-artifact>
     </plugin>
 
-<!--
-    <plugin>
-        <name>Jakarta JSP Examples (Jetty)</name>
-        <module-id>geronimo/jsp-examples-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Examples</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>commons-collections/commons-collections/3.1/jar</dependency>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>LDAP Demo Web App (Jetty)</name>
-        <module-id>geronimo/ldap-demo-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Examples</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>geronimo/ldap-realm/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>LDAP Demo Security Realm</name>
-        <module-id>geronimo/ldap-realm/1.2-SNAPSHOT/car</module-id>
-        <category>Examples</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <jvm-version>1.5</jvm-version>
-        <dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>Jakarta Servlet Examples (Jetty)</name>
-        <module-id>geronimo/servlets-examples-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Examples</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>jUDDI Server 0.9rc4 for Geronimo</name>
-        <module-id>geronimo/uddi-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Integration</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>geronimo/system-database/1.2-SNAPSHOT/car</dependency>
-        <dependency>juddi/juddi/0.9rc4/jar</dependency>
-        <dependency>geronimo/geronimo-uddi-db/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>Geronimo Admin Console (Jetty)</name>
-        <module-id>geronimo/webconsole-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Core Geronimo</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
-        <dependency>portlet-api/portlet-api/1.0/jar</dependency>
-        <dependency>org.apache.pluto/pluto/1.0.1/jar</dependency>
-        <dependency>geronimo/geronimo-console-core/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-management/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-test-ddbean/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-deploy-jsr88/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-deploy-config/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-service-builder/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-connector-builder/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-naming-builder/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-security-builder/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-j2ee-schema/1.2-SNAPSHOT/jar</dependency>
-        <dependency>xmlbeans/xbean/2.0.0/jar</dependency>
-        <dependency>stax/stax-api/1.0/jar</dependency>
-        <dependency>activemq/activemq-gbean-management/3.2.4-SNAPSHOT/jar</dependency>
-        <dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
-        <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-converter/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-crypto/1.2-SNAPSHOT/jar</dependency>
-        <dependency>geronimo/geronimo-jetty/1.2-SNAPSHOT/jar</dependency>
-    </plugin>
-
-    <plugin>
-        <name>Geronimo Remote Deployment Support (Jetty)</name>
-        <module-id>geronimo/remote-deploy-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Core Geronimo</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>geronimo/geronimo-remote-deploy-lib/1.2-SNAPSHOT/jar</dependency>
-        <dependency>xmlbeans/xbean/2.0.0/jar</dependency>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>Geronimo JMX Debug Tool (Jetty)</name>
-        <module-id>geronimo/jmxdebug-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Core Geronimo</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>commons-collections/commons-collections/3.1/jar</dependency>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>Geronimo Welcome App (Jetty)</name>
-        <module-id>geronimo/welcome-jetty/1.2-SNAPSHOT/car</module-id>
-        <category>Core Geronimo</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <prerequisite>
-            <id>geronimo/jetty/*/car</id>
-            <description>
-                This is a web application or web-related module, configured for the Jetty
web container. It will not run
-                on Tomcat versions of Geronimo. If you need a Tomcat version of this application,
you'll need to get it
-                from another Tomcat Geronimo installation.
-            </description>
-        </prerequisite>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
-    </plugin>
-
-    <plugin>
-        <name>Apache Directory 0.92 for Geronimo</name>
-        <module-id>geronimo/directory/1.2-SNAPSHOT/car</module-id>
-        <category>Security</category>
-        <description>Test Data</description>
-        <geronimo-versions>
-            <version>1.2-SNAPSHOT</version>
-        </geronimo-versions>
-        <dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
-        <dependency>geronimo/geronimo-directory/1.2-SNAPSHOT/jar</dependency>
-    </plugin>
--->
-
     <default-repository>http://nowhere.com/</default-repository>
 
 </geronimo-plugin-list>

Modified: geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1.xml?rev=675240&r1=675239&r2=675240&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1.xml Wed
Jul  9 08:59:21 2008
@@ -18,7 +18,7 @@
 
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
   configId="hello"
-  parentId="geronimo/j2ee-security/1.0.1-SNAPSHOT/car">
+  parentId="geronimo/j2ee-security/2.2-SNAPSHOT/car">
 
 
     <gbean name="hello-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
@@ -27,10 +27,10 @@
             <name>hello-login-chain</name>
         </reference>
         <reference name="ServerInfo">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-system/1.0.1-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-system/2.2-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
         </reference>
         <reference name="LoginService">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-security/1.0.1-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=JaasLoginService,name=JaasLoginService</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-security/2.2-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=JaasLoginService,name=JaasLoginService</gbean-name>
         </reference>
     </gbean>
 

Modified: geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml?rev=675240&r1=675239&r2=675240&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml
Wed Jul  9 08:59:21 2008
@@ -28,7 +28,7 @@
       <dep:dependency>
         <dep:groupId>geronimo</dep:groupId>
         <dep:artifactId>j2ee-security</dep:artifactId>
-        <dep:version>1.0.1-SNAPSHOT</dep:version>
+        <dep:version>2.2-SNAPSHOT</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
     </dep:dependencies>

Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml?rev=675240&r1=675239&r2=675240&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml Wed Jul  9
08:59:21 2008
@@ -23,17 +23,6 @@
     <module>
         <web>portal-driver.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-portal-driver</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes />
-                <dep:non-overridable-classes />
-            </dep:environment>
             <context-root>/console</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
             <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
@@ -57,23 +46,8 @@
     <module>
         <web>base-portlets.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-base-portlets</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes>
-                    <filter>org.apache.commons.digester</filter>
-                </dep:hidden-classes>
-                <dep:non-overridable-classes />
-            </dep:environment>
-
             <context-root>/console-base</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
-
             <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">
                     <name>ServerInfo</name>
@@ -82,14 +56,12 @@
                     <name>properties-login</name>
                 </reference>
             </gbean> 
-             
             <!-- i18n support -->
             <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <reference name="ConsoleResourceRegistry">
                     <name>ConsoleResourceRegistry</name>
                 </reference>
             </gbean>
-
            <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Welcome</attribute>
                <attribute name="portletContext">/console-base</attribute>
@@ -98,7 +70,6 @@
                    <name>PlutoPortalServices</name>
                </reference>
            </gbean>
-
            <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Information</attribute>
                <attribute name="portletContext">/console-base</attribute>
@@ -250,7 +221,6 @@
                    <name>PlutoPortalServices</name>
                </reference>
            </gbean>
-
         </web-app>
     </module>
 

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=675240&r1=675239&r2=675240&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Wed Jul  9
08:59:21 2008
@@ -23,17 +23,6 @@
     <module>
         <web>portal-driver.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-portal-driver</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes />
-                <dep:non-overridable-classes />
-            </dep:environment>
             <context-root>/console</context-root>
             <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
@@ -58,24 +47,9 @@
     <module>
         <web>base-portlets.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-base-portlets</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes>
-                    <filter>org.apache.commons.digester</filter>
-                </dep:hidden-classes>
-                <dep:non-overridable-classes />
-            </dep:environment>
-
             <context-root>/console-base</context-root>
             <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
-
             <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">
                     <name>ServerInfo</name>
@@ -84,14 +58,12 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
-             
             <!-- i18n support -->
             <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <reference name="ConsoleResourceRegistry">
                     <name>ConsoleResourceRegistry</name>
                 </reference>
             </gbean>
-
             <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">Welcome</attribute>
                 <attribute name="portletContext">/console-base</attribute>
@@ -100,7 +72,6 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-
             <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">Server/Information</attribute>
                 <attribute name="portletContext">/console-base</attribute>
@@ -164,7 +135,6 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-
             <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">Services/Repository</attribute>
                 <attribute name="portletContext">/console-base</attribute>
@@ -252,7 +222,6 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-
         </web-app>
     </module>
 



Mime
View raw message