Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 85130 invoked from network); 10 Jan 2011 15:10:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jan 2011 15:10:01 -0000 Received: (qmail 35440 invoked by uid 500); 10 Jan 2011 15:10:01 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 35296 invoked by uid 500); 10 Jan 2011 15:09:58 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 35289 invoked by uid 99); 10 Jan 2011 15:09:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jan 2011 15:09:57 +0000 X-ASF-Spam-Status: No, hits=-1999.4 required=10.0 tests=ALL_TRUSTED,HK_RANDOM_ENVFROM X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jan 2011 15:09:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DEF952388903; Mon, 10 Jan 2011 15:09:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057231 - in /geronimo/server/branches/3.0-M2: ./ framework/ framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/ framework/configs/karaf-framework/src/main/distribution/windows-text/bin/ framework/configs/karaf-framewor... Date: Mon, 10 Jan 2011 15:09:29 -0000 To: scm@geronimo.apache.org From: rickmcguire@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110110150929.DEF952388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickmcguire Date: Mon Jan 10 15:09:27 2011 New Revision: 1057231 URL: http://svn.apache.org/viewvc?rev=1057231&view=rev Log: merge r1056676 into M2 branch 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/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java (props changed) geronimo/server/branches/3.0-M2/plugins/openejb/ (props changed) geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java 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/GeronimoSingletonService.java geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.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/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 Mon Jan 10 15:09:27 2011 @@ -1,2 +1,3 @@ /geronimo/server/branches/2.2:832538,885058 /geronimo/server/branches/3.0-M1:948864,951792 +/geronimo/server/trunk:1056676 Propchange: geronimo/server/branches/3.0-M2/framework/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1056676 Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,3 +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/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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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/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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,3 +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/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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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/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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588,1056676 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 Mon Jan 10 15:09:27 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* +/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588,1056676 Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-tool/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588,1056676 Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/pom.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,2 +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 Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 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* +/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588,1056676 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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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-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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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-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 Mon Jan 10 15:09:27 2011 @@ -1,2 +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 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 Mon Jan 10 15:09:27 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* +/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:749113,749116-807432,809079-825588,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:749113,749116-807432,809079-825588,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:749113,749116-807432,809079-825588,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:749113,749116-807432,809079-825588,1056676 Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 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* +/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*,1056676 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 Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588,1056676 Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-upgrade/src/test/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 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 +/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588,1056676 Propchange: geronimo/server/branches/3.0-M2/plugins/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,3 +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/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 Mon Jan 10 15:09:27 2011 @@ -1 +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 Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,4 +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/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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 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 Mon Jan 10 15:09:27 2011 @@ -1,2 +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 Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,2 +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 Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,3 +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 Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,3 +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 Propchange: geronimo/server/branches/3.0-M2/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java ('svn:mergeinfo' removed) Propchange: geronimo/server/branches/3.0-M2/plugins/openejb/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,3 +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 Modified: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?rev=1057231&r1=1057230&r2=1057231&view=diff ============================================================================== --- geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java (original) +++ geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Mon Jan 10 15:09:27 2011 @@ -176,7 +176,7 @@ public class EjbModuleImpl implements EJ if (appContext == null) { throw new IllegalStateException("Not started"); } - return appContext.get(OWBContext.class).getSingletons(); + return appContext.get(OWBContext.class).getWebBeansContext(); } public void doStart() throws Exception { Modified: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java?rev=1057231&r1=1057230&r2=1057231&view=diff ============================================================================== --- geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java (original) +++ geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java Mon Jan 10 15:09:27 2011 @@ -52,7 +52,7 @@ public class ThreadSingletonServiceAdapt //not embedded. Are we the first ejb module to try this? if (startupObject.getAppContext().get(OWBContext.class) == null) { startupObject.getAppContext().set(OWBContext.class, owbContext); - WebBeansContext webBeansContext = owbContext.getSingletons(); + WebBeansContext webBeansContext = owbContext.getWebBeansContext(); setConfiguration(webBeansContext.getOpenWebBeansConfiguration()); try { webBeansContext.getService(ContainerLifecycle.class).startApplication(startupObject); @@ -84,7 +84,7 @@ public class ThreadSingletonServiceAdapt @Override public Object contextEntered(org.apache.openejb.cdi.OWBContext owbContext) { - return GeronimoSingletonService.contextEntered(owbContext.getSingletons()); + return GeronimoSingletonService.contextEntered(owbContext.getWebBeansContext()); } @Override 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 Mon Jan 10 15:09:27 2011 @@ -1 +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 Propchange: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -2,3 +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 Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java?rev=1057231&r1=1057230&r2=1057231&view=diff ============================================================================== --- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java (original) +++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java Mon Jan 10 15:09:27 2011 @@ -20,18 +20,15 @@ package org.apache.geronimo.openwebbeans; -import java.util.Map; - import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.config.WebBeansFinder; -import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.spi.SingletonService; import org.osgi.framework.Bundle; /** * @version $Rev$ $Date$ */ -public class GeronimoSingletonService implements SingletonService { +public class GeronimoSingletonService implements SingletonService { private static final ThreadLocal contexts = new ThreadLocal(); private static Bundle bundle; @@ -55,9 +52,8 @@ public class GeronimoSingletonService im } @Override - public Object get(Object key, String singletonClassName) { - WebBeansContext context = getContext(); - return context.get(singletonClassName); + public WebBeansContext get(Object key) { + return getContext(); } private WebBeansContext getContext() { @@ -73,18 +69,4 @@ public class GeronimoSingletonService im getContext().clear(); } - @Override - public boolean isExist(Object key, String singletonClassName) { - throw new UnsupportedOperationException("isExist is never called"); - } - - @Override - public Object getExist(Object key, String singletonClassName) { - return getContext().get(singletonClassName); - } - - @Override - public Object getKey(Object singleton) { - return null; - } } Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java?rev=1057231&r1=1057230&r2=1057231&view=diff ============================================================================== --- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java (original) +++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java Mon Jan 10 15:09:27 2011 @@ -208,6 +208,7 @@ public class WebBeansConfigurationListen ConversationManager conversationManager = webBeansContext.getConversationManager(); conversationManager.destroyConversationContextWithSessionId(event.getSession().getId()); } + @Override public void sessionWillPassivate(HttpSessionEvent event) 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 Mon Jan 10 15:09:27 2011 @@ -1,2 +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 /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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 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 Mon Jan 10 15:09:27 2011 @@ -1,3 +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 Propchange: geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -0,0 +1 @@ +/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:1056676 Propchange: geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -0,0 +1 @@ +/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:1056676 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 Mon Jan 10 15:09:27 2011 @@ -1,2 +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 Propchange: geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 10 15:09:27 2011 @@ -1,2 +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