Author: rmannibucau
Date: Fri Mar 21 17:22:53 2014
New Revision: 1579988
URL: http://svn.apache.org/r1579988
Log:
TOMEE-1145 fixing pmd + using provisioningutil to resolve classpath element of
resources
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
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=1579988&r1=1579987&r2=1579988&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
Fri Mar 21 17:22:53 2014
@@ -76,6 +76,7 @@ import org.apache.openejb.loader.FileUti
import org.apache.openejb.loader.Files;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Options;
+import org.apache.openejb.loader.ProvisioningUtil;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.monitoring.LocalMBeanServer;
import org.apache.openejb.resource.jdbc.DataSourceFactory;
@@ -85,6 +86,7 @@ import org.apache.openejb.Extensions;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Messages;
+import org.apache.openejb.util.PropertyPlaceHolderHelper;
import org.apache.openejb.util.SuperProperties;
import org.apache.openejb.util.URISupport;
import org.apache.openejb.util.URLs;
@@ -1157,12 +1159,12 @@ public class ConfigurationFactory implem
}
if (service.getClasspath() != null &&
service.getClasspath().length() > 0) {
- final FileUtils base = SystemInstance.get().getBase();
final String[] strings =
service.getClasspath().split(File.pathSeparator);
final URI[] classpath = new URI[strings.length];
for (int i = 0; i < strings.length; i++) {
final String string = strings[i];
- final File file = base.getFile(string, false);
+ final String pathname =
PropertyPlaceHolderHelper.simpleValue(ProvisioningUtil.realLocation(string));
+ final File file = new File(pathname);
classpath[i] = file.toURI();
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java?rev=1579988&r1=1579987&r2=1579988&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
Fri Mar 21 17:22:53 2014
@@ -29,7 +29,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -203,7 +202,7 @@ public class TldScanner {
if (file.isDirectory()) {
final File[] a = file.listFiles();
if (a != null) {
- files.addAll(Arrays.asList(a));
+ files.addAll(asList(a));
}
} else if (file.getName().endsWith(".tld")) {
try {
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java?rev=1579988&r1=1579987&r2=1579988&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
Fri Mar 21 17:22:53 2014
@@ -148,7 +148,7 @@ public class ServiceClasspathTest extend
final PrintStream out = new PrintStream(IO.write(xml));
out.println("<openejb>\n" +
- " <Resource id=\"Orange\" type=\"org.superbiz.foo.Orange\"
class-name=\"org.superbiz.foo.Orange\" classpath=\"" + jar.getName() + "\">\n" +
+ " <Resource id=\"Orange\" type=\"org.superbiz.foo.Orange\"
class-name=\"org.superbiz.foo.Orange\" classpath=\"${openejb.home}/" +
jar.getName() + "\">\n" +
" red = FF\n" +
" green = 99\n" +
" blue = 00\n" +
