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 2010/10/23 01:33:02 UTC
svn commit: r1026528 - in /openejb/trunk/openejb3: ./
container/openejb-core/src/main/java/org/apache/openejb/config/
container/openejb-core/src/main/java/org/apache/openejb/persistence/
container/openejb-core/src/test/java/org/apache/openejb/config/ e...
Author: dblevins
Date: Fri Oct 22 23:33:02 2010
New Revision: 1026528
URL: http://svn.apache.org/viewvc?rev=1026528&view=rev
Log:
svn merge -r 1026526:1026527 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1026527
------------------------------------------------------------------------
r1026527 | dblevins | 2010-10-22 16:29:48 -0700 (Fri, 22 Oct 2010) | 2 lines
OPENEJB-1371: Double encoding of persistence-unit root-url leads to issues in paths with spaces
------------------------------------------------------------------------
Modified:
openejb/trunk/openejb3/ (props changed)
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 22 23:33:02 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527
/openejb/branches/openejb-jcdi:984659-985270
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1026528&r1=1026527&r2=1026528&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Fri Oct 22 23:33:02 2010
@@ -38,6 +38,7 @@ import org.apache.openejb.jee.oejb2.Jaxb
import org.apache.openejb.jee.oejb2.OpenejbJarType;
import org.apache.openejb.jee.oejb3.JaxbOpenejbJar3;
import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.apache.openejb.util.URLs;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -97,17 +98,16 @@ public class ReadDescriptors implements
List<URL> persistenceUrls = (List<URL>) appModule.getAltDDs().get("persistence.xml");
if (persistenceUrls != null) {
for (URL persistenceUrl : persistenceUrls) {
- String moduleName = persistenceUrl.toExternalForm().replaceFirst("!/?META-INF/.*persistence.xml$", "");
- moduleName = moduleName.replaceFirst("/?META-INF/.*persistence.xml$", "/");
- if (moduleName.startsWith("jar:")) moduleName = moduleName.substring("jar:".length());
- if (moduleName.startsWith("file:")) moduleName = moduleName.substring("file:".length());
-// if (moduleName1.endsWith("/")) moduleName1 = moduleName1.substring(0, moduleName1.length() - 1);
+
+ final String path = URLs.toFilePath(persistenceUrl);
+ String moduleName = path.replaceFirst("/?META-INF/.*persistence.xml$", "/");
+
try {
Persistence persistence = JaxbPersistenceFactory.getPersistence(persistenceUrl);
PersistenceModule persistenceModule = new PersistenceModule(moduleName, persistence);
persistenceModule.getWatchedResources().add(moduleName);
if ("file".equals(persistenceUrl.getProtocol())) {
- persistenceModule.getWatchedResources().add(toFilePath(persistenceUrl));
+ persistenceModule.getWatchedResources().add(path);
}
appModule.getPersistenceModules().add(persistenceModule);
} catch (Exception e1) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java?rev=1026528&r1=1026527&r2=1026528&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java Fri Oct 22 23:33:02 2010
@@ -220,24 +220,7 @@ public class PersistenceUnitInfoImpl imp
}
private URL toUrl(File root) throws MalformedURLException {
- URL url = root.toURI().toURL();
-
- try {
- url.toURI();
- } catch (URISyntaxException e) {
- // Likely has spaces in it.
- try {
- String s = url.toExternalForm();
- URL fixed = new URL(s.replaceAll(" ", "%20"));
- fixed.toURI();
- url = fixed;
- } catch (MalformedURLException e1) {
- } catch (URISyntaxException e1) {
- // oh well, we tried.
- }
- }
-
- return url;
+ return root.toURI().toURL();
}
public List<String> getManagedClassNames() {
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 22 23:33:02 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 22 23:33:02 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270