geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1080159 [1/2] - 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-fr...
Date Thu, 10 Mar 2011 08:58:54 GMT
Author: rwonly
Date: Thu Mar 10 08:58:52 2011
New Revision: 1080159

URL: http://svn.apache.org/viewvc?rev=1080159&view=rev
Log:
GERONIMO-5847 merge in 1080141,1080142 from turnk to 3.0_M2

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/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/bundlemanager/BundleManagerPortlet.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
    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   (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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588,1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588,1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/plugins:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438,1080141-1080142
 /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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438,1080141-1080142

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.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/bundlemanager/BundleManagerPortlet.java?rev=1080159&r1=1080158&r2=1080159&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java Thu Mar 10 08:58:52 2011
@@ -88,9 +88,11 @@ public class BundleManagerPortlet extend
     private PortletRequestDispatcher showManifestView;
     
     private PortletRequestDispatcher showWiredBundlesView;
-
-    //private String moduleType;
-
+    
+    private static final String VIEW_MANIFEST_PAGE = "view_manifest";
+    
+    private static final String VIEW_WIRED_BUNDLES_PAGE = "view_wired_bundles";
+    
     protected void doHelp(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
         helpView.include(renderRequest, renderResponse);
     }
@@ -115,15 +117,15 @@ public class BundleManagerPortlet extend
         
         String page = actionRequest.getParameter("page");
         
-        if ("view_manifest".equals(page)){
+        if (VIEW_MANIFEST_PAGE.equals(page)){
             // no actions in this page
-            actionResponse.setRenderParameter("page", "view_manifest");
+            actionResponse.setRenderParameter("page", VIEW_MANIFEST_PAGE);
             
-        }else if ("view_wired_bundles".equals(page)){
+        }else if (VIEW_WIRED_BUNDLES_PAGE.equals(page)){
             String id = actionRequest.getParameter("bundleId");;
             String perspectiveType = actionRequest.getParameter("perspectiveType");
             //set render params
-            actionResponse.setRenderParameter("page", "view_wired_bundles");
+            actionResponse.setRenderParameter("page", VIEW_WIRED_BUNDLES_PAGE);
             actionResponse.setRenderParameter("bundleId", id);
             actionResponse.setRenderParameter("perspectiveTypeValue", perspectiveType);
             
@@ -222,7 +224,7 @@ public class BundleManagerPortlet extend
             
             String page = renderRequest.getParameter("page");
             
-            if ("view_manifest".equals(page)){
+            if (VIEW_MANIFEST_PAGE.equals(page)){
                 BundleContext bundleContext = getBundleContext(renderRequest);
                 
                 long id = Long.valueOf(renderRequest.getParameter("bundleId"));
@@ -247,7 +249,7 @@ public class BundleManagerPortlet extend
                 renderRequest.setAttribute("bundleInfo", bundleInfo);
                 showManifestView.include(renderRequest, renderResponse);
                 
-            }else if("view_wired_bundles".equals(page)) {
+            }else if(VIEW_WIRED_BUNDLES_PAGE.equals(page)) {
                 
                 BundleContext bundleContext = getBundleContext(renderRequest);
                 
@@ -392,7 +394,8 @@ public class BundleManagerPortlet extend
     }
     
     private static boolean matchBundle(Bundle bundle, String searchString){
-        if (bundle.getSymbolicName() == null || (bundle.getSymbolicName() != null && bundle.getSymbolicName().indexOf(searchString) == -1)){
+        if (bundle.getSymbolicName() == null 
+            || (bundle.getSymbolicName() != null && bundle.getSymbolicName().toLowerCase().indexOf(searchString.trim().toLowerCase()) == -1)){ // match ignore case
             return false;
         }
         return true;

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp?rev=1080159&r1=1080158&r2=1080159&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp Thu Mar 10 08:58:52 2011
@@ -63,78 +63,78 @@ function uninstallPrompt(target, bundleI
 
 <br/>
 <table width="100%" class="TableLine" summary="OSGi install">
-	<tr>
-		<td>
-			<form id="installForm" enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name='action' value='install'/></portlet:actionURL>">
-				Install New:
-				<input type="file" name="bundleFile" />
-					        
-				Start:
-				<input type="checkbox" name="startAfterInstalled" value="yes"/>
-					        
-			    Start Level:
-				<input type="text" id="startLevel" name="startLevel" value="${initStartLevel}" style="width:30" size="4" />
-			
-			    <input type="submit" style="width:80px" onClick="return checkStartLevel()" value="install" />
-			</form>
-			<script language="javascript">
-				function checkStartLevel(){
-					if (document.getElementById("startLevel").value < ${initStartLevel}) {
-						if (!confirm("The start-level you are setting is less than the framework initial start-level(" + ${initStartLevel} + "). Will you continue?")) {
-							return false;
-						}
-					}
-				}
-			</script>
-		</td>
-	</tr>
+    <tr>
+        <td>
+            <form id="installForm" enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name='action' value='install'/></portlet:actionURL>">
+                Install New:
+                <input type="file" name="bundleFile" />
+                            
+                Start:
+                <input type="checkbox" name="startAfterInstalled" value="yes"/>
+                            
+                Start Level:
+                <input type="text" id="startLevel" name="startLevel" value="${initStartLevel}" style="width:30" size="4" />
+            
+                <input type="submit" style="width:80px" onClick="return checkStartLevel()" value="install" />
+            </form>
+            <script language="javascript">
+                function checkStartLevel(){
+                    if (document.getElementById("startLevel").value < ${initStartLevel}) {
+                        if (!confirm("The start-level you are setting is less than the framework initial start-level(" + ${initStartLevel} + "). Will you continue?")) {
+                            return false;
+                        }
+                    }
+                }
+            </script>
+        </td>
+    </tr>
 </table>
 
 <br/>
 
 
 <table width="100%" class="TableLine" summary="OSGi filter">
-	<tr>
-		<td>
-			<form id="listForm" method="POST" action="<portlet:actionURL><portlet:param name='action' value='list'/></portlet:actionURL>">
-				Show Bundles:
-				<input type="radio" name="listType" value="all" onclick="submitListForm(this)"  />All&nbsp;
-				<input type="radio" name="listType" value="wab" onclick="submitListForm(this)"  />WAB&nbsp;
-				<input type="radio" name="listType" value="blueprint" onclick="submitListForm(this)"  />Blueprint&nbsp;
-				<input type="radio" name="listType" value="system" onclick="submitListForm(this)"  />System&nbsp;
-				<input type="radio" name="listType" value="configuration" onclick="submitListForm(this)"  />Geronimo Configuration&nbsp;
-			</form>
-			<script language="javascript">    
- 				var radiogroup = document.getElementsByName("listType");  
- 				for(var i=0;i<radiogroup.length;i++){    
- 					if(radiogroup[i].value == "${listTypeValue}"){    
-   						radiogroup[i].checked = true;  
- 					}    
- 				}
- 			</script>
-			<script language="javascript">
-				function submitListForm(radiobutton){
-					if (radiobutton.value != "${listTypeValue}"){
-						document.getElementById("listForm").submit();
-					}
-				}
-			</script>
-		</td>
-		<td align="right">
-			<form id="searchForm" method="POST" action="<portlet:actionURL><portlet:param name='action' value='search'/></portlet:actionURL>">
-			    Search by Symbolic Name:
-				<input type="text" id="searchString" name="searchString" value="${searchStringValue}"/>&nbsp;
-    			<input type="submit" value="Go" />
-    			<input type="button" value="Reset" onclick="resetSearchForm()" />
-			</form>
-			<script language="javascript">
-				function resetSearchForm(){
-					document.getElementById("searchString").value = "";
-					document.getElementById("searchForm").submit();
-				}
-			</script>
-		</td>
-	</tr>
+    <tr>
+        <td>
+            <form id="listForm" method="POST" action="<portlet:actionURL><portlet:param name='action' value='list'/></portlet:actionURL>">
+                Show Bundles:
+                <input type="radio" name="listType" value="all" onclick="submitListForm(this)"  />All&nbsp;
+                <input type="radio" name="listType" value="wab" onclick="submitListForm(this)"  />WAB&nbsp;
+                <input type="radio" name="listType" value="blueprint" onclick="submitListForm(this)"  />Blueprint&nbsp;
+                <input type="radio" name="listType" value="system" onclick="submitListForm(this)"  />System&nbsp;
+                <input type="radio" name="listType" value="configuration" onclick="submitListForm(this)"  />Geronimo Configuration&nbsp;
+            </form>
+            <script language="javascript">    
+                 var radiogroup = document.getElementsByName("listType");  
+                 for(var i=0;i<radiogroup.length;i++){    
+                     if(radiogroup[i].value == "${listTypeValue}"){    
+                           radiogroup[i].checked = true;  
+                     }    
+                 }
+             </script>
+            <script language="javascript">
+                function submitListForm(radiobutton){
+                    if (radiobutton.value != "${listTypeValue}"){
+                        document.getElementById("listForm").submit();
+                    }
+                }
+            </script>
+        </td>
+        <td align="right">
+            <form id="searchForm" method="POST" action="<portlet:actionURL><portlet:param name='action' value='search'/></portlet:actionURL>">
+                Search by Symbolic Name:
+                <input type="text" id="searchString" name="searchString" value="${searchStringValue}"/>&nbsp;
+                <input type="submit" value="Go" />
+                <input type="button" value="Reset" onclick="resetSearchForm()" />
+            </form>
+            <script language="javascript">
+                function resetSearchForm(){
+                    document.getElementById("searchString").value = "";
+                    document.getElementById("searchForm").submit();
+                }
+            </script>
+        </td>
+    </tr>
 </table>
 
 <br/>
@@ -144,31 +144,31 @@ function uninstallPrompt(target, bundleI
         <th scope="col" width="40">Id</th>   
         <th scope="col">Symbolic Name</th> 
         <c:if test="${listTypeValue == 'wab'}" >          
-        	<th scope="col">URL</th>
+            <th scope="col">URL</th>
         </c:if>
         <th scope="col" width="150">Version</th>
         <th scope="col" width="150">Type</th>
         <th scope="col" width="100">State</th>
         <c:if test="${listTypeValue == 'blueprint'}" >
-        	<th scope="col">blueprint</th>
+            <th scope="col">blueprint</th>
         </c:if>
         <c:if test="${listTypeValue != 'system' && listTypeValue != 'configuration'}" >
-        	<th scope="col" width="80">Actions</th>
+            <th scope="col" width="80">Actions</th>
         </c:if>
         <th scope="col" width="80">Utilities</th>
     </tr>
-	<script language="javascript"> 
-	    var oldcolor;
-	    function highlightTr(theTr){
-	        oldcolor = theTr.style.backgroundColor;
-	        theTr.style.backgroundColor = '#e2ebfe';
-	    }
-	    function recoverTr(theTr){
-	        theTr.style.backgroundColor = oldcolor;
-	    }
-	</script> 
-  	<c:set var="backgroundClass" value='MediumBackground'/>
-  	<c:forEach var="bundleInfo" items="${extendedBundleInfos}">
+    <script language="javascript"> 
+        var oldcolor;
+        function highlightTr(theTr){
+            oldcolor = theTr.style.backgroundColor;
+            theTr.style.backgroundColor = '#e2ebfe';
+        }
+        function recoverTr(theTr){
+            theTr.style.backgroundColor = oldcolor;
+        }
+    </script> 
+      <c:set var="backgroundClass" value='MediumBackground'/>
+      <c:forEach var="bundleInfo" items="${extendedBundleInfos}">
       <c:choose>
           <c:when test="${backgroundClass == 'MediumBackground'}" >
               <c:set var="backgroundClass" value='LightBackground'/>
@@ -186,22 +186,22 @@ function uninstallPrompt(target, bundleI
                 
         <!-- WAB context path -->
         <c:if test="${listTypeValue == 'wab'}" >  
-		        <td>
-		            <c:if test="${bundleInfo.state.running}">
-		            	<c:forEach var="contextPath" items="${bundleInfo.contextPaths}">
-		            		&nbsp;<a href="${contextPath}">${contextPath}</a>&nbsp;<br/>
-		            	</c:forEach>
-		            </c:if>
-		        </td>
+                <td>
+                    <c:if test="${bundleInfo.state.running}">
+                        <c:forEach var="contextPath" items="${bundleInfo.contextPaths}">
+                            &nbsp;<a href="${contextPath}">${contextPath}</a>&nbsp;<br/>
+                        </c:forEach>
+                    </c:if>
+                </td>
         </c:if>
         
-		<!-- version -->
+        <!-- version -->
         <td>&nbsp;${bundleInfo.bundleVersion}&nbsp;</td>
 
-		<!--  bundle type -->
+        <!--  bundle type -->
         <td>
-        	<c:forEach var="type" items="${bundleInfo.types}">
-            	${type}&nbsp;
+            <c:forEach var="type" items="${bundleInfo.types}">
+                ${type}&nbsp;
             </c:forEach>
         </td>
 
@@ -210,52 +210,52 @@ function uninstallPrompt(target, bundleI
         
         <!-- Blueprint info -->
         <c:if test="${listTypeValue == 'blueprint'}" >
-	        <td class="${backgroundClass}">
-				&nbsp;
-	        </td>
+            <td class="${backgroundClass}">
+                &nbsp;
+            </td>
         </c:if>
         
         <!-- actions -->
-		<c:if test="${listTypeValue != 'system' && listTypeValue != 'configuration'}" >
-	        <td>
-	        	&nbsp;
-	        	<c:if test="${bundleInfo.operable}">
-		        	<!-- Start/Stop -->
-					<c:if test="${bundleInfo.state.running}">
-						<span> 
-		                    <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='stop'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_stop.png" title="stop"/></a>&nbsp;
-		                </span>
-		            </c:if>
-		            <c:if test="${bundleInfo.state.stopped}">
-		                <span>
-		                    <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='start'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_start.png" title="start"/></a>&nbsp;
-		                </span>
-		            </c:if>
-		
-		        	<!-- Update action -->
-		            <span> 
-		                <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='update'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_update.png" title="update"/></a>&nbsp;
-		            </span>
-		        
-		        	<!-- Uninstall action -->
-		            <span> 
-		                <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt(this, '${bundleInfo.bundleId}','${bundleInfo.symbolicName}');"><img border="0" src="<%=request.getContextPath()%>/images/bundle_delete.png" title="uninstall"/></a>&nbsp;
-		            </span>
-	            </c:if>
-	        </td>
+        <c:if test="${listTypeValue != 'system' && listTypeValue != 'configuration'}" >
+            <td>
+                &nbsp;
+                <c:if test="${bundleInfo.operable}">
+                    <!-- Start/Stop -->
+                    <c:if test="${bundleInfo.state.running}">
+                        <span> 
+                            <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='stop'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_stop.png" title="stop"/></a>&nbsp;
+                        </span>
+                    </c:if>
+                    <c:if test="${bundleInfo.state.stopped}">
+                        <span>
+                            <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='start'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_start.png" title="start"/></a>&nbsp;
+                        </span>
+                    </c:if>
+        
+                    <!-- Update action -->
+                    <span> 
+                        <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='update'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_update.png" title="update"/></a>&nbsp;
+                    </span>
+                
+                    <!-- Uninstall action -->
+                    <span> 
+                        <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt(this, '${bundleInfo.bundleId}','${bundleInfo.symbolicName}');"><img border="0" src="<%=request.getContextPath()%>/images/bundle_delete.png" title="uninstall"/></a>&nbsp;
+                    </span>
+                </c:if>
+            </td>
         </c:if>
 
-		<!-- Util -->
+        <!-- Util -->
         <td>
-        	&nbsp;
-			<a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest"/></a>&nbsp;
-			<c:if test="${bundleInfo.state.running}" >
-				<a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles"/></a>
-			</c:if>
-		</td>
+            &nbsp;
+            <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest"/></a>&nbsp;
+            <c:if test="${bundleInfo.state.running}" >
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles"/></a>
+            </c:if>
+        </td>
 
       </tr>
-  	</c:forEach>
+      </c:forEach>
 </table>
 
 

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp?rev=1080159&r1=1080158&r2=1080159&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp Thu Mar 10 08:58:52 2011
@@ -8,24 +8,24 @@
 <a href="<portlet:actionURL/>" >OSGi Manager</a> > Show Bundle Manifest
 <br/><br/>
 <table width="100%" class="TableLine" summary="OSGi install">
-	<tr>
-		<td>
-			The Manifest of Bundle:
-			&nbsp;
-			<b>
-			${bundleInfo.symbolicName}
-			</b>
-			(id=${bundleInfo.bundleId})
-			(version=${bundleInfo.bundleVersion})
-			[${bundleInfo.state}]
-		</td>
-		</td>
-		<td align="right">
-			<c:if test="${bundleInfo.state.running}" >          
-				<a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">View Wired Bundles</a>
-			</c:if>
-		</td>
-	</tr>
+    <tr>
+        <td>
+            The Manifest of Bundle:
+            &nbsp;
+            <b>
+            ${bundleInfo.symbolicName}
+            </b>
+            (id=${bundleInfo.bundleId})
+            (version=${bundleInfo.bundleVersion})
+            [${bundleInfo.state}]
+        </td>
+        </td>
+        <td align="right">
+            <c:if test="${bundleInfo.state.running}" >          
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">View Wired Bundles</a>
+            </c:if>
+        </td>
+    </tr>
 </table>
 <br/>
 <table width="100%" class="TableLine" summary="OSGi Manifest">
@@ -46,7 +46,7 @@
       <tr>
         <!-- bundle id -->
         <td class="${backgroundClass}">${manifestHeader.key}</td>
-		<td class="${backgroundClass}">${manifestHeader.value}</td>
+        <td class="${backgroundClass}">${manifestHeader.value}</td>
       </tr>
     </c:forEach>
 </table>
\ No newline at end of file

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp?rev=1080159&r1=1080158&r2=1080159&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp Thu Mar 10 08:58:52 2011
@@ -6,168 +6,168 @@
 <portlet:defineObjects/>
 
 <form id="perspectiveForm" method="POST" action="<portlet:actionURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:actionURL>">
-	<a href="<portlet:actionURL/>" >OSGi Manager</a> > Show Wired Bundles &nbsp;
-	(
-	<input type="radio" name="perspectiveType" value="package" onclick="submitPerspectiveForm(this)"  />Package Perspective
-	/
-	<input type="radio" name="perspectiveType" value="bundle" onclick="submitPerspectiveForm(this)"  />Bundle Perspective
-	)
+    <a href="<portlet:actionURL/>" >OSGi Manager</a> > Show Wired Bundles &nbsp;
+    (
+    <input type="radio" name="perspectiveType" value="package" onclick="submitPerspectiveForm(this)"  />Package Perspective
+    /
+    <input type="radio" name="perspectiveType" value="bundle" onclick="submitPerspectiveForm(this)"  />Bundle Perspective
+    )
 </form>
 <script language="javascript">    
- 	var radiogroup = document.getElementsByName("perspectiveType");  
- 	for(var i=0;i<radiogroup.length;i++){    
- 		if(radiogroup[i].value == "${perspectiveTypeValue}"){    
-   			radiogroup[i].checked = true;  
- 		}    
- 	}
+     var radiogroup = document.getElementsByName("perspectiveType");  
+     for(var i=0;i<radiogroup.length;i++){    
+         if(radiogroup[i].value == "${perspectiveTypeValue}"){    
+               radiogroup[i].checked = true;  
+         }    
+     }
 </script>
 <script language="javascript">
-	function submitPerspectiveForm(radiobutton){
-		if (radiobutton.value != "${perspectiveTypeValue}"){
-			document.getElementById("perspectiveForm").submit();
-		}
-	}
+    function submitPerspectiveForm(radiobutton){
+        if (radiobutton.value != "${perspectiveTypeValue}"){
+            document.getElementById("perspectiveForm").submit();
+        }
+    }
 </script>
 <table width="100%" class="TableLine" summary="OSGi install">
-	<tr>
-		<td>
-			The Wired Bundles of Bundle:
-			&nbsp;
-			<b>
-			${bundleInfo.symbolicName}
-			</b>
-			(id=${bundleInfo.bundleId})
-			(version=${bundleInfo.bundleVersion})
-			[${bundleInfo.state}]
-		</td>
-		<td align="right">
-			<a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">View Manifest</a>&nbsp;
-		</td>
-	</tr>
+    <tr>
+        <td>
+            The Wired Bundles of Bundle:
+            &nbsp;
+            <b>
+            ${bundleInfo.symbolicName}
+            </b>
+            (id=${bundleInfo.bundleId})
+            (version=${bundleInfo.bundleVersion})
+            [${bundleInfo.state}]
+        </td>
+        <td align="right">
+            <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">View Manifest</a>&nbsp;
+        </td>
+    </tr>
 </table>
 <br/>
 <c:if test="${perspectiveTypeValue == 'package'}" > 
-	<table width="100%" class="TableLine" summary="Wired Bundles">
-	    <tr class="DarkBackground">
-	        <th scope="col" width="40%">Importing Packages</th>   
-	        <th scope="col" width="60%">From Bundles</th> 
-	    </tr>
-	    <c:set var="backgroundClass" value='MediumBackground'/>
-	    <c:forEach var="ipp" items="${importingPackagePerspectives}">
-	      <c:choose>
-	          <c:when test="${backgroundClass == 'MediumBackground'}" >
-	              <c:set var="backgroundClass" value='LightBackground'/>
-	          </c:when>
-	          <c:otherwise>
-	              <c:set var="backgroundClass" value='MediumBackground'/>
-	          </c:otherwise>
-	      </c:choose>
-	      <tr>
-	        <td class="${backgroundClass}">
-	        	${ipp.packageInfo.packageName} (version=${ipp.packageInfo.packageVersion})
-	        </td>
-			<td class="${backgroundClass}">
-			    <c:forEach var="info" items="${ipp.bundleInfos}">
-	            	${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
-	            	<a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
-					<a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
-	            	<br/>
-	            </c:forEach>
-			</td>
-	      </tr>
-	    </c:forEach>
-	</table>
-	<br/>
-	<table width="100%" class="TableLine" summary="Wired Bundles">
-	    <tr class="DarkBackground">
-	        <th scope="col" width="40%">Exporting Packages</th>   
-	        <th scope="col" width="60%">To Bundles</th> 
-	    </tr>
-	    <c:set var="backgroundClass" value='MediumBackground'/>
-	    <c:forEach var="epp" items="${exportingPackagePerspectives}">
-	      <c:choose>
-	          <c:when test="${backgroundClass == 'MediumBackground'}" >
-	              <c:set var="backgroundClass" value='LightBackground'/>
-	          </c:when>
-	          <c:otherwise>
-	              <c:set var="backgroundClass" value='MediumBackground'/>
-	          </c:otherwise>
-	      </c:choose>
-	      <tr>
-	        <td class="${backgroundClass}">
-	        	${epp.packageInfo.packageName} (version=${epp.packageInfo.packageVersion})
-	        </td>
-			<td class="${backgroundClass}">
-			    <c:forEach var="info" items="${epp.bundleInfos}">
-	            	${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
-	            	<a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
-					<a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
-	            	<br/>
-	            </c:forEach>
-			</td>
-	      </tr>
-	    </c:forEach>
-	</table>
+    <table width="100%" class="TableLine" summary="Wired Bundles">
+        <tr class="DarkBackground">
+            <th scope="col" width="40%">Importing Packages</th>   
+            <th scope="col" width="60%">From Bundles</th> 
+        </tr>
+        <c:set var="backgroundClass" value='MediumBackground'/>
+        <c:forEach var="ipp" items="${importingPackagePerspectives}">
+          <c:choose>
+              <c:when test="${backgroundClass == 'MediumBackground'}" >
+                  <c:set var="backgroundClass" value='LightBackground'/>
+              </c:when>
+              <c:otherwise>
+                  <c:set var="backgroundClass" value='MediumBackground'/>
+              </c:otherwise>
+          </c:choose>
+          <tr>
+            <td class="${backgroundClass}">
+                ${ipp.packageInfo.packageName} (version=${ipp.packageInfo.packageVersion})
+            </td>
+            <td class="${backgroundClass}">
+                <c:forEach var="info" items="${ipp.bundleInfos}">
+                    ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
+                    <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+                    <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+                    <br/>
+                </c:forEach>
+            </td>
+          </tr>
+        </c:forEach>
+    </table>
+    <br/>
+    <table width="100%" class="TableLine" summary="Wired Bundles">
+        <tr class="DarkBackground">
+            <th scope="col" width="40%">Exporting Packages</th>   
+            <th scope="col" width="60%">To Bundles</th> 
+        </tr>
+        <c:set var="backgroundClass" value='MediumBackground'/>
+        <c:forEach var="epp" items="${exportingPackagePerspectives}">
+          <c:choose>
+              <c:when test="${backgroundClass == 'MediumBackground'}" >
+                  <c:set var="backgroundClass" value='LightBackground'/>
+              </c:when>
+              <c:otherwise>
+                  <c:set var="backgroundClass" value='MediumBackground'/>
+              </c:otherwise>
+          </c:choose>
+          <tr>
+            <td class="${backgroundClass}">
+                ${epp.packageInfo.packageName} (version=${epp.packageInfo.packageVersion})
+            </td>
+            <td class="${backgroundClass}">
+                <c:forEach var="info" items="${epp.bundleInfos}">
+                    ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
+                    <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+                    <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+                    <br/>
+                </c:forEach>
+            </td>
+          </tr>
+        </c:forEach>
+    </table>
 </c:if>
 
 <c:if test="${perspectiveTypeValue == 'bundle'}" > 
-	<table width="100%" class="TableLine" summary="Wired Bundles">
-	    <tr class="DarkBackground">
-	        <th scope="col" width="40%">Importing Packages</th>   
-	        <th scope="col" width="60%">From Bundles</th> 
-	    </tr>
-	    <c:set var="backgroundClass" value='MediumBackground'/>
-	    <c:forEach var="ibp" items="${importingBundlePerspectives}">
-	      <c:choose>
-	          <c:when test="${backgroundClass == 'MediumBackground'}" >
-	              <c:set var="backgroundClass" value='LightBackground'/>
-	          </c:when>
-	          <c:otherwise>
-	              <c:set var="backgroundClass" value='MediumBackground'/>
-	          </c:otherwise>
-	      </c:choose>
-	      <tr>
-	        <td class="${backgroundClass}">
-	        	<c:forEach var="info" items="${ibp.packageInfos}">
-	            	${info.packageName} (version=${info.packageVersion}) <br/>
-	            </c:forEach>
-	        </td>
-			<td class="${backgroundClass}">
-				${ibp.bundleInfo.symbolicName} (id=${ibp.bundleInfo.bundleId}) (version=${ibp.bundleInfo.bundleVersion})
-				<a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
-				<a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
-			</td>
-	      </tr>
-	    </c:forEach>
-	</table>
-	<br/>
-	<table width="100%" class="TableLine" summary="Wired Bundles">
-	    <tr class="DarkBackground">
-	        <th scope="col" width="40%">Exporting Packages</th>   
-	        <th scope="col" width="60%">To Bundles</th> 
-	    </tr>
-	    <c:set var="backgroundClass" value='MediumBackground'/>
-	    <c:forEach var="ebp" items="${exportingBundlePerspectives}">
-	      <c:choose>
-	          <c:when test="${backgroundClass == 'MediumBackground'}" >
-	              <c:set var="backgroundClass" value='LightBackground'/>
-	          </c:when>
-	          <c:otherwise>
-	              <c:set var="backgroundClass" value='MediumBackground'/>
-	          </c:otherwise>
-	      </c:choose>
-	      <tr>
-	        <td class="${backgroundClass}">
-	        	<c:forEach var="info" items="${ebp.packageInfos}">
-	            	${info.packageName} (version=${info.packageVersion}) <br/>
-	            </c:forEach>
-	        </td>
-			<td class="${backgroundClass}">
-				${ebp.bundleInfo.symbolicName} (id=${ebp.bundleInfo.bundleId}) (version=${ebp.bundleInfo.bundleVersion})
-				<a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${ebp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
-				<a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${ebp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
-			</td>
-	      </tr>
-	    </c:forEach>
-	</table>
+    <table width="100%" class="TableLine" summary="Wired Bundles">
+        <tr class="DarkBackground">
+            <th scope="col" width="40%">Importing Packages</th>   
+            <th scope="col" width="60%">From Bundles</th> 
+        </tr>
+        <c:set var="backgroundClass" value='MediumBackground'/>
+        <c:forEach var="ibp" items="${importingBundlePerspectives}">
+          <c:choose>
+              <c:when test="${backgroundClass == 'MediumBackground'}" >
+                  <c:set var="backgroundClass" value='LightBackground'/>
+              </c:when>
+              <c:otherwise>
+                  <c:set var="backgroundClass" value='MediumBackground'/>
+              </c:otherwise>
+          </c:choose>
+          <tr>
+            <td class="${backgroundClass}">
+                <c:forEach var="info" items="${ibp.packageInfos}">
+                    ${info.packageName} (version=${info.packageVersion}) <br/>
+                </c:forEach>
+            </td>
+            <td class="${backgroundClass}">
+                ${ibp.bundleInfo.symbolicName} (id=${ibp.bundleInfo.bundleId}) (version=${ibp.bundleInfo.bundleVersion})
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+            </td>
+          </tr>
+        </c:forEach>
+    </table>
+    <br/>
+    <table width="100%" class="TableLine" summary="Wired Bundles">
+        <tr class="DarkBackground">
+            <th scope="col" width="40%">Exporting Packages</th>   
+            <th scope="col" width="60%">To Bundles</th> 
+        </tr>
+        <c:set var="backgroundClass" value='MediumBackground'/>
+        <c:forEach var="ebp" items="${exportingBundlePerspectives}">
+          <c:choose>
+              <c:when test="${backgroundClass == 'MediumBackground'}" >
+                  <c:set var="backgroundClass" value='LightBackground'/>
+              </c:when>
+              <c:otherwise>
+                  <c:set var="backgroundClass" value='MediumBackground'/>
+              </c:otherwise>
+          </c:choose>
+          <tr>
+            <td class="${backgroundClass}">
+                <c:forEach var="info" items="${ebp.packageInfos}">
+                    ${info.packageName} (version=${info.packageVersion}) <br/>
+                </c:forEach>
+            </td>
+            <td class="${backgroundClass}">
+                ${ebp.bundleInfo.symbolicName} (id=${ebp.bundleInfo.bundleId}) (version=${ebp.bundleInfo.bundleVersion})
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${ebp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${ebp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+            </td>
+          </tr>
+        </c:forEach>
+    </table>
 </c:if>
\ No newline at end of file

Propchange: geronimo/server/branches/3.0-M2/plugins/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1074421,1075055,1078438
+/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1074421,1075055,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

Propchange: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438,1080141-1080142
 /tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java:742915

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142

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 Thu Mar 10 08:58:52 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,1071183,1078438
+/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,1078438,1080141-1080142



Mime
View raw message