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 2012/01/17 22:56:14 UTC
svn commit: r1232604 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/assembler/
utils/openejb-provisionning/ utils/openejb-provisionning/src/main/assembly/
utils/openejb-provisionning/src/main/java/org/apache/openej...
Author: rmannibucau
Date: Tue Jan 17 21:56:13 2012
New Revision: 1232604
URL: http://svn.apache.org/viewvc?rev=1232604&view=rev
Log:
adding LocationResolver as it sounds easier to maintain (thanks dblevins)
Added:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/LocationResolver.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
openejb/trunk/openejb/utils/openejb-provisionning/pom.xml
openejb/trunk/openejb/utils/openejb-provisionning/src/main/assembly/provisionning.xml
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1232604&r1=1232603&r2=1232604&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Tue Jan 17 21:56:13 2012
@@ -180,7 +180,8 @@ public class DeployerEjb implements Depl
final Class<?> clazz;
try {
clazz = DeployerEjb.class.getClassLoader().loadClass("org.apache.openejb.resolver.Resolver");
- return (String) clazz.getDeclaredMethod("resolve", String.class).invoke(null, rawLocation);
+ final LocationResolver instance = (LocationResolver) clazz.newInstance();
+ return instance.resolve(rawLocation);
} catch (ClassNotFoundException e) {
return rawLocation;
}
Added: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/LocationResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/LocationResolver.java?rev=1232604&view=auto
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/LocationResolver.java (added)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/LocationResolver.java Tue Jan 17 21:56:13 2012
@@ -0,0 +1,5 @@
+package org.apache.openejb.assembler;
+
+public interface LocationResolver {
+ String resolve(final String rawLocation) throws Exception;
+}
Modified: openejb/trunk/openejb/utils/openejb-provisionning/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/pom.xml?rev=1232604&r1=1232603&r2=1232604&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-provisionning/pom.xml (original)
+++ openejb/trunk/openejb/utils/openejb-provisionning/pom.xml Tue Jan 17 21:56:13 2012
@@ -135,6 +135,13 @@
<groupId>${project.groupId}</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: openejb/trunk/openejb/utils/openejb-provisionning/src/main/assembly/provisionning.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/src/main/assembly/provisionning.xml?rev=1232604&r1=1232603&r2=1232604&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-provisionning/src/main/assembly/provisionning.xml (original)
+++ openejb/trunk/openejb/utils/openejb-provisionning/src/main/assembly/provisionning.xml Tue Jan 17 21:56:13 2012
@@ -35,9 +35,6 @@
<dependencySet>
<outputDirectory>/</outputDirectory>
<scope>runtime</scope>
- <excludes>
- <exclude>org.apache.openejb:*</exclude>
- </excludes>
</dependencySet>
</dependencySets>
</assembly>
Modified: openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java?rev=1232604&r1=1232603&r2=1232604&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java (original)
+++ openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java Tue Jan 17 21:56:13 2012
@@ -1,5 +1,6 @@
package org.apache.openejb.resolver;
+import org.apache.openejb.assembler.LocationResolver;
import org.apache.openejb.loader.FileUtils;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.resolver.maven.Handler;
@@ -9,15 +10,11 @@ import java.io.File;
import java.io.FileOutputStream;
import java.net.URL;
-public class Resolver {
+public class Resolver implements LocationResolver {
public static final String MVN_PREFIX = "mvn:";
public static final String APP_CACHE = System.getProperty("openejb.deployer.cache.folder", "temp");
- private Resolver() {
- // no-op
- }
-
- public static String resolve(final String rawLocation) throws Exception {
+ public String resolve(final String rawLocation) throws Exception {
if (rawLocation.startsWith(MVN_PREFIX) && rawLocation.length() > MVN_PREFIX.length()) {
final String info = rawLocation.substring(MVN_PREFIX.length());
final Parser parser = new Parser(info);