Author: rmannibucau
Date: Sun Aug 24 12:09:37 2014
New Revision: 1620125
URL: http://svn.apache.org/r1620125
Log:
provisining module compilation fix - we should surely deprecate it
Removed:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/LocationResolver.java
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
tomee/tomee/trunk/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java?rev=1620125&r1=1620124&r2=1620125&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
(original)
+++
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
Sun Aug 24 12:09:37 2014
@@ -178,7 +178,7 @@ public class ProvisioningResolver {
}
// used when a resolver wants to use a local file by calling back this
facade resolver
- public static class LocalInputStream extends InputStream {
+ public static final class LocalInputStream extends InputStream {
private final String path;
private LocalInputStream(final String path) {
Modified:
tomee/tomee/trunk/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java?rev=1620125&r1=1620124&r2=1620125&view=diff
==============================================================================
---
tomee/tomee/trunk/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java
(original)
+++
tomee/tomee/trunk/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/Resolver.java
Sun Aug 24 12:09:37 2014
@@ -17,27 +17,24 @@
package org.apache.openejb.resolver;
import org.apache.openejb.loader.IO;
-import org.apache.openejb.loader.LocationResolver;
-import org.apache.openejb.loader.ProvisioningUtil;
import org.apache.openejb.resolver.maven.Handler;
import org.apache.openejb.resolver.maven.Parser;
import java.io.File;
import java.net.URL;
-import static org.apache.openejb.loader.ProvisioningUtil.cacheFile;
+import static
org.apache.openejb.loader.provisining.ProvisioningResolver.cacheFile;
-public class Resolver implements LocationResolver {
- @Override
+public class Resolver {
public String resolve(final String rawLocation) throws Exception {
- if (rawLocation.startsWith(ProvisioningUtil.MVN_PREFIX) &&
rawLocation.length() > ProvisioningUtil.MVN_PREFIX.length()) {
+ if (rawLocation.startsWith("mvn:") && rawLocation.length() >
"mvn:".length()) {
- final String info =
rawLocation.substring(ProvisioningUtil.MVN_PREFIX.length());
+ final String info = rawLocation.substring("mvn".length());
final Parser parser = new Parser(info);
final File file = cacheFile(parser.getArtifactPath());
if (!file.exists() || !file.canRead()) {
try {
- final URL url = new
URL(ProvisioningUtil.MVN_PREFIX.substring(ProvisioningUtil.MVN_PREFIX.length()
- 1), "localhost", -1, info, new Handler());
+ final URL url = new
URL(rawLocation.substring("mvn:".length()), "localhost", -1, info, new
Handler());
final File parentFile = file.getParentFile();
if (!parentFile.exists()) {
if (!parentFile.mkdirs()) {
