Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 33282 invoked from network); 10 Mar 2011 08:59:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Mar 2011 08:59:17 -0000 Received: (qmail 62831 invoked by uid 500); 10 Mar 2011 08:59:17 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 62788 invoked by uid 500); 10 Mar 2011 08:59:17 -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 62780 invoked by uid 99); 10 Mar 2011 08:59:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Mar 2011 08:59:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Thu, 10 Mar 2011 08:59:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B717C23889DA; Thu, 10 Mar 2011 08:58:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1080159 [2/2] - in /geronimo/server/branches/3.0-M2: ./ framework/ framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/ framework/configs/karaf-framework/src/main/distribution/windows-text/bin/ framework/configs/karaf-fr... Date: Thu, 10 Mar 2011 08:58:54 -0000 To: scm@geronimo.apache.org From: rwonly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110310085855.B717C23889DA@eris.apache.org> 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 Thu Mar 10 08:58:52 2011 @@ -1,4 +1,4 @@ /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:832538,885058 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:948864,951792 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:887507 -/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1071532,1078438 +/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1071532,1078438,1080141-1080142 Propchange: geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 10 08:58:52 2011 @@ -1 +1 @@ -/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438 +/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142 Propchange: geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 10 08:58:52 2011 @@ -1 +1 @@ -/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438 +/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142 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 Thu Mar 10 08:58:52 2011 @@ -1,3 +1,3 @@ /geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources:832538,885058 /geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:948864,951792 -/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438 +/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142 Propchange: geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 10 08:58:52 2011 @@ -1,3 +1,3 @@ /geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/resources:832538,885058 /geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:948864,951792 -/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438 +/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:1056676,1057959-1057962,1064432,1071183,1078438,1080141-1080142