You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2011/01/12 12:39:30 UTC
svn commit: r1058089 - 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...
Author: rickmcguire
Date: Wed Jan 12 11:39:28 2011
New Revision: 1058089
URL: http://svn.apache.org/viewvc?rev=1058089&view=rev
Log:
backport trunk owb changes
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/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/pom.xml
geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M2/plugins/openejb/ (props changed)
geronimo/server/branches/3.0-M2/plugins/openejb/openejb/pom.xml
geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
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/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
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/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/pom.xml
geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
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 Wed Jan 12 11:39:28 2011
@@ -1,3 +1,3 @@
/geronimo/server/branches/2.2:832538,885058
/geronimo/server/branches/3.0-M1:948864,951792
-/geronimo/server/trunk:1056676
+/geronimo/server/trunk:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588,1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*,1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/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
Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588,1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/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
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 Jan 12 11:39:28 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
+/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
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 Jan 12 11:39:28 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
+/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
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*,1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/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
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 Jan 12 11:39:28 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
+/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
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 Jan 12 11:39:28 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
+/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
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 Jan 12 11:39:28 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
+/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
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/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
Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588,1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962
/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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962
Modified: geronimo/server/branches/3.0-M2/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java Wed Jan 12 11:39:28 2011
@@ -68,6 +68,8 @@ import org.apache.geronimo.transaction.m
import org.apache.geronimo.web.WebAttributeName;
import org.apache.geronimo.web.info.ServletInfo;
import org.apache.geronimo.web.info.WebAppInfo;
+import org.apache.webbeans.config.WebBeansFinder;
+import org.apache.webbeans.spi.SingletonService;
import org.eclipse.jetty.security.Authenticator;
import org.eclipse.jetty.security.IdentityService;
import org.eclipse.jetty.security.LoginService;
@@ -110,7 +112,7 @@ public class AbstractWebModuleTest exten
}
protected WebAppContextWrapper setUpAppContext(String securityRealmName, SecurityHandlerFactory securityHandlerFactory, String policyContextId, RunAsSource runAsSource, String uriString, WebAppInfo webAppInfo) throws Exception {
-
+ WebBeansFinder.clearInstances(getClass().getClassLoader());
ApplicationPolicyConfigurationManager applicationPolicyConfigurationManager = null;
//Setup default JSP Factory
Class.forName("org.apache.jasper.compiler.JspRuntimeContext");
Modified: geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml Wed Jan 12 11:39:28 2011
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty8-clustering-wadi</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
@@ -58,11 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-wab</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/pom.xml?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/pom.xml Wed Jan 12 11:39:28 2011
@@ -71,6 +71,13 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.configs</groupId>-->
<!--<artifactId>jasper</artifactId>-->
Modified: geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/src/main/history/dependencies.xml?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/jetty8/jetty8/src/main/history/dependencies.xml Wed Jan 12 11:39:28 2011
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty8</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
@@ -33,6 +33,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-1_6</artifactId>
<type>car</type>
</dependency>
@@ -63,11 +68,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-wab</artifactId>
<type>jar</type>
</dependency>
Propchange: geronimo/server/branches/3.0-M2/plugins/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962
Modified: geronimo/server/branches/3.0-M2/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/openejb/pom.xml?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/openejb/openejb/pom.xml Wed Jan 12 11:39:28 2011
@@ -78,6 +78,13 @@
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
Modified: geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml Wed Jan 12 11:39:28 2011
@@ -3,25 +3,10 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-digester</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-discovery</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
<type>car</type>
@@ -33,6 +18,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
</dependency>
@@ -58,35 +48,15 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa20</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-bundle</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>commons-dbcp-all</artifactId>
<type>jar</type>
@@ -152,31 +122,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.quartz</artifactId>
<type>jar</type>
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder:1056676,1057959-1057962
Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java Wed Jan 12 11:39:28 2011
@@ -33,31 +33,30 @@ import org.apache.webbeans.web.context.W
import org.apache.webbeans.web.lifecycle.WebContainerLifecycle;
/**
- *
* @version $Rev: 698441 $ $Date: 2008-09-24 00:10:08 -0700 (Wed, 24 Sep 2008) $
*/
public class OpenWebBeansWebInitializer {
-
- public OpenWebBeansWebInitializer(WebBeansContext owbContext, ServletContext servletContext) {
- GeronimoSingletonService.contextEntered(owbContext);
+
+ public OpenWebBeansWebInitializer(WebBeansContext webBeansContext, ServletContext servletContext) {
+ GeronimoSingletonService.contextEntered(webBeansContext);
try {
- setConfiguration(owbContext.getOpenWebBeansConfiguration());
+ setConfiguration(webBeansContext.getOpenWebBeansConfiguration());
//from OWB's WebBeansConfigurationListener
if (servletContext != null) {
- ContainerLifecycle lifeCycle = WebBeansContext.getInstance().getService(ContainerLifecycle.class);
+ ContainerLifecycle lifeCycle = webBeansContext.getService(ContainerLifecycle.class);
- try
- {
- lifeCycle.startApplication(new ServletContextEvent(servletContext));
- servletContext.setAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION, "true");
+ try {
+ lifeCycle.startApplication(new ServletContextEvent(servletContext));
}
- catch (Exception e)
- {
- // logger.error(OWBLogConst.ERROR_0018, event.getServletContext().getContextPath());
- WebBeansUtil.throwRuntimeExceptions(e);
+ catch (Exception e) {
+ // logger.error(OWBLogConst.ERROR_0018, event.getServletContext().getContextPath());
+ WebBeansUtil.throwRuntimeExceptions(e);
}
+ boolean isWBApplication = !webBeansContext.getScannerService().getBeanXmls().isEmpty();
+ servletContext.setAttribute(OpenWebBeansConfiguration.PROPERTY_OWB_APPLICATION, Boolean.toString(isWBApplication));
}
+
} finally {
GeronimoSingletonService.contextExited(null);
}
@@ -65,7 +64,7 @@ public class OpenWebBeansWebInitializer
private void setConfiguration(OpenWebBeansConfiguration configuration) {
configuration.setProperty(OpenWebBeansConfiguration.APPLICATION_IS_JSP, "true");
-
+
configuration.setProperty(OpenWebBeansConfiguration.CONTAINER_LIFECYCLE, WebContainerLifecycle.class.getName());
configuration.setProperty(OpenWebBeansConfiguration.JNDI_SERVICE, NoopJndiService.class.getName());
configuration.setProperty(OpenWebBeansConfiguration.SCANNER_SERVICE, OsgiMetaDataScannerService.class.getName());
@@ -77,18 +76,15 @@ public class OpenWebBeansWebInitializer
public static class NoopJndiService implements JNDIService {
public void bind(String name, Object object) {
- System.out.println("Bind");
}
public <T> T lookup(String name, Class<? extends T> expectedClass) {
- System.out.println("Lookup");
return null;
}
public void unbind(String name) {
- System.out.println("Unbind");
}
-
+
}
}
Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java Wed Jan 12 11:39:28 2011
@@ -53,7 +53,6 @@ public class OsgiMetaDataScannerService
private WebBeansLogger logger = WebBeansLogger.getLogger(OsgiMetaDataScannerService.class);
private final WebBeansContext webBeansContext;
- private boolean configured = false;
private static final String META_INF_BEANS_XML = "META-INF/beans.xml";
private static final String WEB_INF_BEANS_XML = "WEB-INF/beans.xml";
@@ -62,13 +61,13 @@ public class OsgiMetaDataScannerService
protected BDABeansXmlScanner bdaBeansXmlScanner;
/** All classes which have to be scanned for Bean information */
- private Set<Class<?>> beanClasses = new HashSet<Class<?>>();
+ private final Set<Class<?>> beanClasses = new HashSet<Class<?>>();
/** the URLs of all META-INF/beans.xml files */
- private Set<URL> beanXMLs = new HashSet<URL>();
+ private final Set<URL> beanXMLs = new HashSet<URL>();
/**contains all the JARs we found with valid beans.xml in it */
- private Set<String> beanArchiveJarNames = new HashSet<String>();
+ private final Set<String> beanArchiveJarNames = new HashSet<String>();
public OsgiMetaDataScannerService(WebBeansContext webBeansContext) {
this.webBeansContext = webBeansContext;
@@ -115,7 +114,6 @@ public class OsgiMetaDataScannerService
{
mainBundle.getBundleContext().ungetService(reference);
}
- configured = true;
}
}
@@ -137,8 +135,7 @@ public class OsgiMetaDataScannerService
@Override
public boolean jarFileDiscoveryRequired(String jarUrl)
{
- boolean isValidBeanArchive = beanArchiveJarNames.contains(jarUrl);
- return isValidBeanArchive;
+ return beanArchiveJarNames.contains(jarUrl);
}
@Override
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:1056676,1057959-1057962
/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java:742915
Modified: geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Wed Jan 12 11:39:28 2011
@@ -62,6 +62,7 @@ import org.apache.geronimo.transaction.m
import org.apache.geronimo.web.WebAttributeName;
import org.apache.geronimo.web.info.ServletInfo;
import org.apache.geronimo.web.info.WebAppInfo;
+import org.apache.webbeans.config.WebBeansFinder;
import org.osgi.framework.Bundle;
@@ -92,6 +93,7 @@ public abstract class AbstractWebModuleT
}
protected TomcatWebAppContext setUpInsecureAppContext(String relativeWebAppRoot, URL configurationBaseURL, SecurityHolder securityHolder, RunAsSource runAsSource, ObjectRetriever tomcatRealm, ValveGBean valveChain, WebAppInfo webAppInfo) throws Exception {
+ WebBeansFinder.clearInstances(getClass().getClassLoader());
configurationBaseURL = cl.getResource("deployables/");
//Setup default JSP Factory
Class.forName("org.apache.jasper.compiler.JspRuntimeContext");
Modified: geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/pom.xml?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/pom.xml Wed Jan 12 11:39:28 2011
@@ -70,6 +70,13 @@
<artifactId>geronimo-tomcat7</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
<!-- Required because tomcat STARTS its default web.xml which has a jasper servlet in it -->
<dependency>
Modified: geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1058089&r1=1058088&r2=1058089&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Wed Jan 12 11:39:28 2011
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat7</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
@@ -33,6 +33,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-1_6</artifactId>
<type>car</type>
</dependency>
@@ -73,11 +78,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat7</artifactId>
<type>jar</type>
</dependency>
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1056676,1057959-1057962
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 Jan 12 11:39:28 2011
@@ -1 +1 @@
-/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:1056676
+/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:1056676,1057959-1057962
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 Jan 12 11:39:28 2011
@@ -1 +1 @@
-/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:1056676
+/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:1056676,1057959-1057962
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 Jan 12 11:39:28 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
+/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:1056676,1057959-1057962
Propchange: geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 12 11:39:28 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
+/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:1056676,1057959-1057962