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 2007/09/15 03:34:20 UTC
svn commit: r575845 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Author: dblevins
Date: Fri Sep 14 18:34:19 2007
New Revision: 575845
URL: http://svn.apache.org/viewvc?rev=575845&view=rev
Log:
Fixes the wedged build. Code still too mysterious, needs to be cleaned up.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=575845&r1=575844&r2=575845&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Fri Sep 14 18:34:19 2007
@@ -64,6 +64,7 @@
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.Join;
import javax.xml.bind.JAXBException;
import java.io.File;
@@ -630,14 +631,14 @@
OpenEjbConfiguration runningConfig = getRunningConfig();
for (ResourceInfo resourceInfo : runningConfig.facilities.resources) {
- if (resourceInfo.types.contains(type)) {
+ if (isResourceType(resourceInfo.service, resourceInfo.types, type)) {
resourceIds.add(resourceInfo.id);
}
}
if (sys != null) {
for (ResourceInfo resourceInfo : sys.facilities.resources) {
- if (resourceInfo.types.contains(type)) {
+ if (isResourceType(resourceInfo.service, resourceInfo.types, type)) {
resourceIds.add(resourceInfo.id);
}
}
@@ -646,13 +647,30 @@
// the above sys instance
if (openejb != null) {
for (Resource resource : openejb.getResource()) {
- if (resource.getType() != null && resource.getType().equals(type)) {
+ ArrayList<String> types = new ArrayList<String>();
+ if (resource.getType() != null){
+ types.add(resource.getType());
+ }
+ if (isResourceType("Resource", types, type)) {
resourceIds.add(resource.getId());
}
}
}
}
return resourceIds;
+ }
+
+ private boolean isResourceType(String service, List<String> types, String type) {
+ boolean b = false;
+ try {
+ if (type == null) return b = true;
+ if (service == null) return b = false;
+ return b = types.contains(type);
+ } finally {
+// System.out.println("isResourceType: "+b+" ["+service +"] ["+type+"] ["+ Join.join(",", types)+"]");
+// Throwable throwable = new Exception().fillInStackTrace();
+// throwable.printStackTrace(System.out);
+ }
}
protected List<String> getContainerIds() {