Author: rmannibucau
Date: Thu Sep 27 12:55:19 2012
New Revision: 1390976
URL: http://svn.apache.org/viewvc?rev=1390976&view=rev
Log:
this file shouldn't have been modified + better fix for jndi sub tree management
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1390976&r1=1390975&r2=1390976&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Thu Sep 27 12:55:19 2012
@@ -1829,23 +1829,23 @@ public class AutoConfig implements Dynam
private String normalizeResourceId(String resourceId) {
if (resourceId == null) return null;
- if (resourceId.startsWith("comp/env/")) {
- resourceId = resourceId.substring("comp/env/".length());
+ if (resourceId.startsWith("java:")) {
+ resourceId = resourceId.substring("java:".length());
}
// strip off "java:comp/env"
- if (resourceId.startsWith("java:comp/env/")) {
- resourceId = resourceId.substring("java:comp/env/".length());
+ if (resourceId.startsWith("comp/env/")) {
+ resourceId = resourceId.substring("comp/env/".length());
}
// strip off "java:openejb/Resource"
- if (resourceId.startsWith("java:openejb/Resource/")) {
- resourceId =
resourceId.substring("java:openejb/Resource/".length());
+ if (resourceId.startsWith("openejb/Resource/")) {
+ resourceId = resourceId.substring("openejb/Resource/".length());
}
// strip off "java:openejb/Connector"
- if (resourceId.startsWith("java:openejb/Connector/")) {
- resourceId =
resourceId.substring("java:openejb/Connector/".length());
+ if (resourceId.startsWith("openejb/Connector/")) {
+ resourceId = resourceId.substring("openejb/Connector/".length());
}
return resourceId;
Modified:
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml?rev=1390976&r1=1390975&r2=1390976&view=diff
==============================================================================
---
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
Thu Sep 27 12:55:19 2012
@@ -25,7 +25,6 @@
<property name="ajpPort">-1</property>
<property name="version">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote-1</property>
- <property name="conf">m</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir-1</property>
</configuration>
</container>
