You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/02/18 01:38:44 UTC
svn commit: r1447110 - in
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/Assembler.java config/ConfigurationFactory.java
Author: rmannibucau
Date: Mon Feb 18 00:38:44 2013
New Revision: 1447110
URL: http://svn.apache.org/r1447110
Log:
still binding globally app resources (should be reworked for a future release) + better matching of resources in sorting
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1447110&r1=1447109&r2=1447110&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Mon Feb 18 00:38:44 2013
@@ -1818,6 +1818,7 @@ public class Assembler extends Assembler
// ignored
}
}
+
serviceRecipe.setProperty("Definition", PropertiesHelper.propertiesToString(props));
replaceResourceAdapterProperty(serviceRecipe);
@@ -1973,6 +1974,9 @@ public class Assembler extends Assembler
}
bindResource(serviceInfo.id, service);
+ if (serviceInfo.originAppName != null) {
+ serviceInfo.aliases.add(serviceInfo.id.substring(serviceInfo.originAppName.length() + 1));
+ }
for (final String alias : serviceInfo.aliases) {
bindResource(alias, service);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1447110&r1=1447109&r2=1447110&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Mon Feb 18 00:38:44 2013
@@ -1518,6 +1518,11 @@ public class ConfigurationFactory implem
if (ids.contains(value)) {
return (String) value;
}
+ for (final String s : ids) {
+ if (s.endsWith((String) value)) {
+ return s;
+ }
+ }
}
}
return null;