geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
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 GMT
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



Mime
View raw message