You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/01/15 02:44:08 UTC
svn commit: r1231612 - in /openejb/branches/openejb-4.0.0-beta-2: ./
arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/
container/openejb-core/src/test/java/org/apache/openejb/config/
container/opene...
Author: dblevins
Date: Sun Jan 15 01:44:08 2012
New Revision: 1231612
URL: http://svn.apache.org/viewvc?rev=1231612&view=rev
Log:
svn merge -r 1230484:1230485 https://svn.apache.org/repos/asf/openejb/trunk/openejb
http://svn.apache.org/viewvc?view=revision&revision=1230485
------------------------------------------------------------------------
r1230485 | rmannibucau | 2012-01-12 03:02:12 -0800 (Thu, 12 Jan 2012) | 1 line
adding url if not already contained
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-4.0.0-beta-2/ (props changed)
openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/branches/openejb-4.0.0-beta-2/container/openejb-jee/src/test/resources/jsf/ (props changed)
openejb/branches/openejb-4.0.0-beta-2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/branches/openejb-4.0.0-beta-2/examples/application-composer/ (props changed)
openejb/branches/openejb-4.0.0-beta-2/src/ (props changed)
openejb/branches/openejb-4.0.0-beta-2/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
Propchange: openejb/branches/openejb-4.0.0-beta-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:44:08 2012
@@ -1,4 +1,4 @@
/openejb/branches/openejb-3.1.1:779593
/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi:984659-985270
-/openejb/trunk/openejb:1230327,1230343,1230437
+/openejb/trunk/openejb:1230327,1230343,1230437,1230485
Modified: openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java?rev=1231612&r1=1231611&r2=1231612&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java (original)
+++ openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java Sun Jan 15 01:44:08 2012
@@ -38,7 +38,7 @@ import static org.apache.openejb.arquill
*
*/
@RunWith(Arquillian.class)
- public class GetResourcesTest {
+public class GetResourcesTest {
public static final String TEST_NAME = GetResourcesTest.class.getSimpleName();
@Deployment(testable = false) public static WebArchive createDeployment() {
Propchange: openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:44:08 2012
@@ -1,4 +1,4 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
-/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1230327,1230343,1230437
+/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1230327,1230343,1230437,1230485
Propchange: openejb/branches/openejb-4.0.0-beta-2/container/openejb-jee/src/test/resources/jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:44:08 2012
@@ -2,4 +2,4 @@
/geronimo/server/branches/3.0-M1/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:948864,951792
/geronimo/server/trunk/plugins/j2ee/myfaces/geronimo-myfaces-builder/src/test/resources:887507
/openejb/branches/openejb-jcdi/container/openejb-jee/src/test/resources/jsf:984659-985270
-/openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf:1230327,1230343,1230437
+/openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf:1230327,1230343,1230437,1230485
Propchange: openejb/branches/openejb-4.0.0-beta-2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:44:08 2012
@@ -1,4 +1,4 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
-/openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1230327,1230343,1230437
+/openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1230327,1230343,1230437,1230485
Propchange: openejb/branches/openejb-4.0.0-beta-2/examples/application-composer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:44:08 2012
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/application-composer:779593
-/openejb/trunk/openejb/examples/application-composer:1230327,1230343,1230437
+/openejb/trunk/openejb/examples/application-composer:1230327,1230343,1230437,1230485
/openejb/trunk/openejb3/examples/application-composer:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528
Propchange: openejb/branches/openejb-4.0.0-beta-2/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:44:08 2012
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/src:779593
-/openejb/trunk/openejb/src:1230327,1230343,1230437
+/openejb/trunk/openejb/src:1230327,1230343,1230437,1230485
/openejb/trunk/openejb3/src:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528
Modified: openejb/branches/openejb-4.0.0-beta-2/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0-beta-2/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java?rev=1231612&r1=1231611&r2=1231612&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0-beta-2/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java (original)
+++ openejb/branches/openejb-4.0.0-beta-2/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java Sun Jan 15 01:44:08 2012
@@ -129,7 +129,7 @@ public class TomEEWebappLoader extends W
clean.add(url);
}
- } else if (clean.contains(url)) {
+ } else if (!clean.contains(url)) {
clean.add(url);
}
}