Author: rmannibucau
Date: Wed Dec 19 15:28:37 2012
New Revision: 1423884
URL: http://svn.apache.org/viewvc?rev=1423884&view=rev
Log:
using back %20 (updated with decode instead of encode) + fixing packaging of
util/config classes
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java?rev=1423884&r1=1423883&r2=1423884&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
Wed Dec 19 15:28:37 2012
@@ -31,8 +31,10 @@ import java.util.Iterator;
// TODO: review if some more info shouldn't be propagated to module tree to
make it faster
public class PersistenceUnitLinkResolver extends
UniqueDefaultLinkResolver<PersistenceUnit> {
+ private final AppModule module;
+
public PersistenceUnitLinkResolver(final AppModule appModule) {
- super(appModule);
+ module = appModule;
}
@Override
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java?rev=1423884&r1=1423883&r2=1423884&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
Wed Dec 19 15:28:37 2012
@@ -102,7 +102,7 @@ public class UriResolver {
if (uriFile.exists()) {
relative = uriFile.toURI();
} else {
- relative = new URI(FileArchive.decode(uriStr));
+ relative = new URI(uriStr.replace(" ", "%20"));
}
if (relative.isAbsolute()) {
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java?rev=1423884&r1=1423883&r2=1423884&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
Wed Dec 19 15:28:37 2012
@@ -224,7 +224,7 @@ public class AnnotationFinder {
}
final URL url = new URL(jarPath);
if ("file".equals(url.getProtocol())) { // ZipFile is faster than
ZipInputStream
- final JarFile jarFile = new
JarFile(FileArchive.decode(url.getFile()));
+ final JarFile jarFile = new JarFile(url.getFile().replace(" ",
"%20"));
return jar(jarFile);
} else {
InputStream in = url.openStream();
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java?rev=1423884&r1=1423883&r2=1423884&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
Wed Dec 19 15:28:37 2012
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.config.AppModule;
import org.apache.xbean.finder.archive.FileArchive;
import java.net.URI;
@@ -30,15 +29,6 @@ import java.util.TreeMap;
public class LinkResolver<E> {
private final Map<URI, E> byFullName = new TreeMap<URI, E>();
private final Map<String, Collection<E>> byShortName = new TreeMap<String,
Collection<E>>();
- protected final AppModule module;
-
- public LinkResolver() {
- this(null);
- }
-
- public LinkResolver(final AppModule o) {
- module = o;
- }
public boolean add(String modulePackageName, String name, E value) {
return add(URI.create(modulePackageName), name, value);
@@ -67,7 +57,7 @@ public class LinkResolver<E> {
}
private URI resolve(URI moduleURI, String name) {
- name = FileArchive.decode(name);
+ name = name.replace(" ", "%20");
return moduleURI.resolve("#" + name);
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java?rev=1423884&r1=1423883&r2=1423884&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
Wed Dec 19 15:28:37 2012
@@ -18,23 +18,12 @@
package org.apache.openejb.util;
-import org.apache.openejb.config.AppModule;
-import org.apache.openejb.util.LinkResolver;
-
import java.net.URI;
/**
* @version $Rev$ $Date$
*/
public class UniqueDefaultLinkResolver<E> extends LinkResolver<E> {
- public UniqueDefaultLinkResolver() {
- this(null);
- }
-
- public UniqueDefaultLinkResolver(final AppModule appModule) {
- super(appModule);
- }
-
public E resolveLink(String link, URI moduleUri) {
//jpa anyway has a default matching rule
if (link == null || link.length() == 0) {
