geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1071193 - in /geronimo/server/branches/3.0-M2: ./ framework/ framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/ framework/configs/karaf-framework/src/main/distribution/windows-text/bin/ framework/configs/karaf-framewor...
Date Wed, 16 Feb 2011 09:50:40 GMT
Author: genspring
Date: Wed Feb 16 09:50:38 2011
New Revision: 1071193

URL: http://svn.apache.org/viewvc?rev=1071193&view=rev
Log:
svn merge -c r1071183 https://svn.apache.org/repos/asf/geronimo/server/trunk ., GERONIMO-5769 Web Application Bundles (WABs) do not show up in admin console

Modified:
    geronimo/server/branches/3.0-M2/   (props changed)
    geronimo/server/branches/3.0-M2/framework/   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-tool/   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/pom.xml   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-upgrade/src/test/resources/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/connector-1_6/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/server/branches/3.0-M2/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java
    geronimo/server/branches/3.0-M2/plugins/console/console-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/3.0-M2/plugins/openejb/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java   (contents, props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java   (props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java   (props changed)
    geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/   (props changed)
    geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/   (props changed)
    geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/   (props changed)
    geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/   (props changed)

Propchange: geronimo/server/branches/3.0-M2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2:832538,885058
 /geronimo/server/branches/3.0-M1:948864,951792
-/geronimo/server/trunk:1056676,1057959-1057962,1064432
+/geronimo/server/trunk:1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework:826768,832538,885058
 /geronimo/server/branches/3.0-M1/framework:948864,951792
-/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:948864,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:1056676,1057959-1057962,1064432,1071183
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:948864,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:1056676,1057959-1057962,1064432,1071183
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:948864,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:1056676,1057959-1057962,1064432,1071183
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:948864,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:1056676,1057959-1057962,1064432,1071183
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:948864,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:948864,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool:826768,832538,885058,917413
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-tool:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-kernel/pom.xml:832538,885058
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/pom.xml:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml:1056676,1057959-1057962,1064432,1071183

Modified: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java?rev=1071193&r1=1071192&r2=1071193&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java (original)
+++ geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java Wed Feb 16 09:50:38 2011
@@ -46,8 +46,10 @@ public class ConfigurationModuleType imp
     public static final ConfigurationModuleType SPR = new ConfigurationModuleType("SPR", 6);
     
     public static final ConfigurationModuleType EBA = new ConfigurationModuleType("EBA", 7);
+    
+    public static final ConfigurationModuleType WAB = new ConfigurationModuleType("WAB", 8);
 
-    private static final ConfigurationModuleType[] fromInt = {EAR, EJB, CAR, RAR, WAR, SERVICE, SPR,EBA};
+    private static final ConfigurationModuleType[] fromInt = {EAR, EJB, CAR, RAR, WAR, SERVICE, SPR, EBA, WAB};
 
     private final String name;
 

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/SystemLog.java:826768
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:1056676,1057959-1057962,1064432,1071183
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/SystemLog.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java:826768
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:1056676,1057959-1057962,1064432,1071183
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:749113,749116-807432,809079-825588
-/geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-upgrade/src/test/resources:826768,832538,885058
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-upgrade/src/test/resources:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588,1056676,1057959-1057962,1064432
+/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588,1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins:832538,885058
 /geronimo/server/branches/3.0-M1/plugins:948864,951792
-/geronimo/server/trunk/plugins:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins:1056676,1057959-1057962,1064377,1064432-1064433,1071183
 /geronimo/server/trunk/plugins/j2ee:887507

Propchange: geronimo/server/branches/3.0-M2/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:948864,951792
-/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,5 +1,5 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962,1064377,1064432-1064433,1071183
 /geronimo/server/trunk/plugins/j2ee/clustering/geronimo-deploy-farm:887507

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:832538
 /geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:832538
 /geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:832538
 /geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/3.0-M1/plugins/connector-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector/connector-deployer:803943
 /geronimo/server/trunk/plugins/connector/connector-deployer-1_6:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder:799922
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder-1_6:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=1071193&r1=1071192&r2=1071193&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Wed Feb 16 09:50:38 2011
@@ -210,6 +210,7 @@ public class ConfigManagerPortlet extend
         List<ModuleDetails> moduleDetails = new ArrayList<ModuleDetails>();
         ConfigurationManager configManager = PortletManager.getConfigurationManager();
         List<ConfigurationInfo> infos = configManager.listConfigurations();
+    
         for (ConfigurationInfo info : infos) {
             if (ConfigurationModuleType.WAR.getName().equalsIgnoreCase(moduleType)) {
 
@@ -306,8 +307,50 @@ public class ConfigManagerPortlet extend
                     ice.printStackTrace();
                 }
                 moduleDetails.add(details);
+            }  
+            
+        }            
+            
+            // hack to display WAB because WAB can't be get from configManager.listConfigurations();
+            
+        if (ConfigurationModuleType.WAB.getName().equalsIgnoreCase(moduleType)) {
+            
+            Artifact wabQuery = Artifact.createPartial("///" + ConfigurationModuleType.WAB.getName().toLowerCase());
+
+            Artifact[] runningWABs = configManager.getRunning(wabQuery);
+
+            if (runningWABs != null && runningWABs.length > 0) {
+
+                for (Artifact wab : runningWABs) {
+                    ModuleDetails details = new ModuleDetails(wab, ConfigurationModuleType.WAB, State.RUNNING);
+                    try {
+                        AbstractName configObjName = Configuration.getConfigurationAbstractName(wab);
+                        boolean loaded = loadModule(configManager, configObjName);
+
+                        WebModule webModule = (WebModule) PortletManager.getModule(renderRequest, wab);
+
+                        if (webModule != null) {
+                            details.getContextPaths().add(webModule.getContextPath());
+                            details.setDisplayName(webModule.getDisplayName());
+                        }
+
+                        if (showDependencies) {
+                            addDependencies(details, configObjName);
+                        }
+                        if (loaded) {
+                            unloadModule(configManager, configObjName);
+                        }
+                    } catch (InvalidConfigException ice) {
+                        // Should not occur
+                        ice.printStackTrace();
+                    }
+                    moduleDetails.add(details);
+                }
+
             }
         }
+
+        
         Collections.sort(moduleDetails);
         renderRequest.setAttribute("configurations", moduleDetails);
         renderRequest.setAttribute("showWebInfo", Boolean.valueOf(showWebInfo()));
@@ -414,6 +457,7 @@ public class ConfigManagerPortlet extend
 
     private boolean showWebInfo() {
         return ConfigurationModuleType.WAR.getName().equalsIgnoreCase(moduleType) ||
+               ConfigurationModuleType.WAB.getName().equalsIgnoreCase(moduleType) ||
                ConfigurationModuleType.EAR.getName().equalsIgnoreCase(moduleType);
     }
 

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=1071193&r1=1071192&r2=1071193&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Feb 16 09:50:38 2011
@@ -400,6 +400,30 @@ limitations under the License.
         </init-param>
     </portlet>
     <portlet>
+        <description>Portlet for displaying WAB modules</description>
+        <portlet-name>WABModules</portlet-name>
+        <display-name>WAB Modules Portlet</display-name>
+        <portlet-class>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</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>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
+        <portlet-info>
+            <title>Installed WAB Applications</title>
+            <short-title>WAB Modules</short-title>
+            <keywords>WAB Application WAB Module</keywords>
+        </portlet-info>
+        <init-param>
+            <name>config-type</name>
+            <value>WAB</value>
+        </init-param>
+    </portlet>    
+    <portlet>
         <description>Portlet for displaying System modules</description>
         <portlet-name>SystemModules</portlet-name>
         <display-name>System Modules Portlet</display-name>

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=1071193&r1=1071192&r2=1071193&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml Wed Feb 16 09:50:38 2011
@@ -189,6 +189,15 @@ limitations under the License.
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
+     <servlet>
+        <servlet-name>WABModules</servlet-name>
+        <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>WABModules</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>    
     <servlet>
         <servlet-name>SystemModules</servlet-name>
         <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
@@ -343,6 +352,10 @@ limitations under the License.
         <servlet-name>EBAModules</servlet-name>
         <url-pattern>/PlutoInvoker/EBAModules</url-pattern>
     </servlet-mapping>
+     <servlet-mapping>
+        <servlet-name>WABModules</servlet-name>
+        <url-pattern>/PlutoInvoker/WABModules</url-pattern>
+    </servlet-mapping>    
     <servlet-mapping>
         <servlet-name>SystemModules</servlet-name>
         <url-pattern>/PlutoInvoker/SystemModules</url-pattern>

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java?rev=1071193&r1=1071192&r2=1071193&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java Wed Feb 16 09:50:38 2011
@@ -505,7 +505,7 @@ public class KernelManagementHelper impl
                 result = config.findGBean(new AbstractNameQuery(EJBModule.class.getName()));
             } else if (type.equals(ConfigurationModuleType.RAR)) {
                 result = config.findGBean(new AbstractNameQuery(ResourceAdapterModule.class.getName()));
-            } else if (type.equals(ConfigurationModuleType.WAR)) {
+            } else if (type.equals(ConfigurationModuleType.WAR)||type.equals(ConfigurationModuleType.WAB)) {
                 result = config.findGBean(new AbstractNameQuery(WebModule.class.getName()));
             } else {
                 return null;

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=1071193&r1=1071192&r2=1071193&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-tomcat/src/main/plan/plan.xml Wed Feb 16 09:50:38 2011
@@ -209,7 +209,7 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-             <gbean name="EBAModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+            <gbean name="EBAModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">2-2-5/Applications/User Assets/Application EBAs</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[EBAModules]</attribute>
@@ -218,6 +218,16 @@
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
+            </gbean>            
+             <gbean name="WABModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">2-2-6/Applications/User Assets/Application WABs</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[WABModules]</attribute>
+                <attribute name="icon">/images/ico_jar_16x16.gif</attribute>
+                <attribute name="mode">basic</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
             </gbean>
             <gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">4-1/Security/Users and Groups</attribute>

Propchange: geronimo/server/branches/3.0-M2/plugins/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins/openejb:830343,830385,830420,830443,830766,831498,831811,832538,885058,941914
 /geronimo/server/branches/3.0-M1/plugins/openejb:948864,951792
 /geronimo/server/trunk/plugins/j2ee/openejb:887507
-/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:951792
-/geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -2,4 +2,4 @@
 /geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa20-builder:829715
 /geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder:829426,829715,832538,885058
 /geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder:948864,951792
-/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:948864,951792
-/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183
 /tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java:742915

Modified: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java?rev=1071193&r1=1071192&r2=1071193&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java Wed Feb 16 09:50:38 2011
@@ -39,6 +39,7 @@ import org.apache.geronimo.kernel.Kernel
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 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.config.LifecycleException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
@@ -184,7 +185,7 @@ public class WebApplication implements R
                 BundleDeploymentContext deploymentContext =
                     new BundleDeploymentContext(
                         webModule.getEnvironment(),
-                        webModule.getType(),
+                        ConfigurationModuleType.WAB,
                         naming,
                         configurationManager,
                         bundle.getBundleContext(),

Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1056676,1057959-1057962,1064377,1064432-1064433
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183

Propchange: geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1 +1 @@
-/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1 +1 @@
-/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources:832538,885058
 /geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:948864,951792
-/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183

Propchange: geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 09:50:38 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/resources:832538,885058
 /geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:948864,951792
-/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183



Mime
View raw message