You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/04/26 08:47:30 UTC
svn commit: r937937 - in /openejb/trunk/openejb3: ./
assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/
container/openejb-core/src/main/java/org/apache/openejb/
container/openejb-core/src/main/java/org/apa...
Author: djencks
Date: Mon Apr 26 06:47:29 2010
New Revision: 937937
URL: http://svn.apache.org/viewvc?rev=937937&view=rev
Log:
OPENEJB-1252 use file.toURI().toURL() instead of file.toURL(), upgrade xbean where this is fixed also
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentLoaderTest.java
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java
openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/httpd/DefaultHttpBean.java
openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Mon Apr 26 06:47:29 2010
@@ -571,7 +571,7 @@ public class TomcatWebAppBuilder impleme
// EJB deployment descriptors
try {
- ResourceFinder ejbResourceFinder = new ResourceFinder("", standardContext.getLoader().getClassLoader(), file.toURL());
+ ResourceFinder ejbResourceFinder = new ResourceFinder("", standardContext.getLoader().getClassLoader(), file.toURI().toURL());
Map<String, URL> descriptors = ejbResourceFinder.getResourcesMap("META-INF/");
descriptors = DeploymentLoader.altDDSources(descriptors, true);
ejbModule.getAltDDs().putAll(descriptors);
@@ -721,7 +721,7 @@ public class TomcatWebAppBuilder impleme
logger.error("A faces configuration file should be context relative when specified in web.xml. Please fix the value of context parameter javax.faces.CONFIG_FILES for the file "+location);
try {
File file = new File(warFile, location).getCanonicalFile().getAbsoluteFile();
- URL url = file.toURL();
+ URL url = file.toURI().toURL();
facesConfigLocations.add(url);
} catch (IOException e) {
@@ -741,7 +741,7 @@ public class TomcatWebAppBuilder impleme
if(facesConfigFile.exists()){
try {
facesConfigFile = facesConfigFile.getCanonicalFile().getAbsoluteFile();
- URL url = facesConfigFile.toURL();
+ URL url = facesConfigFile.toURI().toURL();
facesConfigLocations.add(url);
} catch (IOException e) {
// TODO: kmalhi:: Remove the printStackTrace after testing
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java Mon Apr 26 06:47:29 2010
@@ -24,6 +24,7 @@ import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
@@ -174,7 +175,7 @@ public class ClassLoaderUtil {
if (item instanceof URL) {
url = (URL) item;
} else if (item instanceof String) {
- url = new URL((String) item);
+ url = new URI((String) item).toURL();
} else {
logger.warning("Don't know how to handle object: " + item.toString() + " of type: " + item.getClass().getCanonicalName() + " in Sun JarFileFactory cache, skipping");
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Mon Apr 26 06:47:29 2010
@@ -135,7 +135,7 @@ public class DeployerEjb implements Depl
String value = (String) entry.getValue();
File dd = new File(value);
if (dd.canRead()) {
- module.getAltDDs().put(name, dd.toURL());
+ module.getAltDDs().put(name, dd.toURI().toURL());
} else {
module.getAltDDs().put(name, value);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Mon Apr 26 06:47:29 2010
@@ -479,7 +479,7 @@ public class Assembler extends Assembler
CmpJarBuilder cmpJarBuilder = new CmpJarBuilder(appInfo, classLoader);
File generatedJar = cmpJarBuilder.getJarFile();
if (generatedJar != null) {
- classLoader = ClassLoaderUtil.createClassLoader(appInfo.jarPath, new URL []{generatedJar.toURL()}, classLoader);
+ classLoader = ClassLoaderUtil.createClassLoader(appInfo.jarPath, new URL []{generatedJar.toURI().toURL()}, classLoader);
}
// JPA - Persistence Units MUST be processed first since they will add ClassFileTransformers
@@ -1373,7 +1373,7 @@ public class Assembler extends Assembler
private URL toUrl(String jarPath) throws OpenEJBException {
try {
- return new File(jarPath).toURL();
+ return new File(jarPath).toURI().toURL();
} catch (MalformedURLException e) {
throw new OpenEJBException(messages.format("cl0001", jarPath, e.getMessage()), e);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Mon Apr 26 06:47:29 2010
@@ -309,7 +309,7 @@ public class AnnotationDeployer implemen
URL url;
if (file.exists()) {
- url = file.toURL();
+ url = file.toURI().toURL();
} else {
url = new URL(location);
}
@@ -416,7 +416,7 @@ public class AnnotationDeployer implemen
URL url;
if (file.exists()) {
- url = file.toURL();
+ url = file.toURI().toURL();
} else {
url = new URL(location);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Mon Apr 26 06:47:29 2010
@@ -111,7 +111,7 @@ public class DeploymentLoader {
try {
tmpFile = File.createTempFile("AppModule-", "", UrlCache.cacheDir);
JarExtractor.copy(URLs.toFile(baseUrl), tmpFile);
- tempURL = tmpFile.toURL();
+ tempURL = tmpFile.toURI().toURL();
} catch (Exception e) {
throw new OpenEJBException(e);
}
@@ -311,7 +311,7 @@ public class DeploymentLoader {
// unpack the resource adapter archive
File rarFile = toFile(entry.getValue());
rarFile = unpack(rarFile);
- entry.setValue(rarFile.toURL());
+ entry.setValue(rarFile.toURI().toURL());
scanDir(appDir, rarLibs, "");
} catch (MalformedURLException e) {
@@ -579,7 +579,7 @@ public class DeploymentLoader {
List<URL> webClassPath = new ArrayList<URL>();
File webInfDir = new File(warFile, "WEB-INF");
try {
- webClassPath.add(new File(webInfDir, "classes").toURL());
+ webClassPath.add(new File(webInfDir, "classes").toURI().toURL());
} catch (MalformedURLException e) {
logger.warning("War path bad: " + new File(webInfDir, "classes"), e);
}
@@ -589,7 +589,7 @@ public class DeploymentLoader {
for (File file : libDir.listFiles()) {
if (file.getName().endsWith(".jar") || file.getName().endsWith(".zip")) {
try {
- webClassPath.add(file.toURL());
+ webClassPath.add(file.toURI().toURL());
} catch (MalformedURLException e) {
logger.warning("War path bad: " + file, e);
}
@@ -621,7 +621,7 @@ public class DeploymentLoader {
URL moduleUrl;
try {
File jarFile = new File(wsModule.getJarLocation());
- moduleUrl = jarFile.toURL();
+ moduleUrl = jarFile.toURI().toURL();
if (jarFile.isFile()) {
moduleUrl = new URL("jar", "", -1, moduleUrl + "!/");
}
@@ -679,7 +679,7 @@ public class DeploymentLoader {
try {
File file = new File(warFile, location).getCanonicalFile().getAbsoluteFile();
if (location.endsWith(".jar")) {
- URL url = file.toURL();
+ URL url = file.toURI().toURL();
tldLocations.add(url);
} else {
Set<URL> urls = scanJarForTagLibs(file);
@@ -746,7 +746,7 @@ public class DeploymentLoader {
logger.error("A faces configuration file should be context relative when specified in web.xml. Please fix the value of context parameter javax.faces.CONFIG_FILES for the file "+location);
try {
File file = new File(warFile, location).getCanonicalFile().getAbsoluteFile();
- URL url = file.toURL();
+ URL url = file.toURI().toURL();
facesConfigLocations.add(url);
} catch (IOException e) {
@@ -766,7 +766,7 @@ public class DeploymentLoader {
if(facesConfigFile.exists()){
try {
facesConfigFile = facesConfigFile.getCanonicalFile().getAbsoluteFile();
- URL url = facesConfigFile.toURL();
+ URL url = facesConfigFile.toURI().toURL();
facesConfigLocations.add(url);
} catch (IOException e) {
// TODO: kmalhi:: Remove the printStackTrace after testing
@@ -859,7 +859,7 @@ public class DeploymentLoader {
} else if (file.getName().endsWith(".tld")) {
try {
file = file.getCanonicalFile().getAbsoluteFile();
- urls.add(file.toURL());
+ urls.add(file.toURI().toURL());
} catch (IOException e) {
logger.warning("JSP tag library location bad: " + file.getAbsolutePath(), e);
}
@@ -878,7 +878,7 @@ public class DeploymentLoader {
try {
jarFile = new JarFile(file);
- URL jarFileUrl = new URL("jar", "", -1, file.toURL().toExternalForm() + "!/");
+ URL jarFileUrl = new URL("jar", "", -1, file.toURI().toURL().toExternalForm() + "!/");
for (JarEntry entry : Collections.list(jarFile.entries())) {
String name = entry.getName();
if (!name.startsWith("META-INF/") || !name.endsWith(".tld")) {
@@ -1055,7 +1055,7 @@ public class DeploymentLoader {
// and the jar file does not contain a directory entry for the uri
if (warFile.isFile()) {
- URL jarURL = new URL("jar", "", -1, warFile.toURL() + "!/");
+ URL jarURL = new URL("jar", "", -1, warFile.toURI().toURL() + "!/");
try {
JarFile jarFile = new JarFile(warFile);
for (JarEntry entry : Collections.list(jarFile.entries())) {
@@ -1072,7 +1072,7 @@ public class DeploymentLoader {
if (webInfDir.isDirectory()) {
for (File file : webInfDir.listFiles()) {
if (!file.isDirectory()) {
- descriptors.put(file.getName(), file.toURL());
+ descriptors.put(file.getName(), file.toURI().toURL());
}
}
}
@@ -1128,7 +1128,7 @@ public class DeploymentLoader {
} else {
String name = file.getName();
try {
- files.put(path + name, file.toURL());
+ files.put(path + name, file.toURI().toURL());
} catch (MalformedURLException e) {
logger.warning("EAR path bad: " + path + name, e);
}
@@ -1246,7 +1246,7 @@ public class DeploymentLoader {
protected static URL getFileUrl(File jarFile) throws OpenEJBException {
URL baseUrl;
try {
- baseUrl = jarFile.toURL();
+ baseUrl = jarFile.toURI().toURL();
} catch (MalformedURLException e) {
throw new OpenEJBException("Malformed URL to app. " + e.getMessage(), e);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationTable.java Mon Apr 26 06:47:29 2010
@@ -102,7 +102,7 @@ public class ValidationTable {
try {
conn = getConnection();
- String jarFileURL = jar.toURL().toExternalForm();
+ String jarFileURL = jar.toURI().toURL().toExternalForm();
PreparedStatement stmt = conn.prepareStatement(_selectValidated);
stmt.setString(1, jarFileURL);
@@ -156,7 +156,7 @@ public class ValidationTable {
try {
conn = getConnection();
File jar = SystemInstance.get().getBase().getFile(jarFile);
- String jarFileURL = jar.toURL().toExternalForm();
+ String jarFileURL = jar.toURI().toURL().toExternalForm();
PreparedStatement stmt = null;
if (_getLastValidated(jarFileURL) != 0L) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java Mon Apr 26 06:47:29 2010
@@ -395,7 +395,7 @@ public class WsDeployer implements Dynam
return new URL(module.getJarLocation());
}
- URL baseUrl = file.toURL();
+ URL baseUrl = file.toURI().toURL();
if (file.isFile()) {
baseUrl = new URL("jar", null, baseUrl.toExternalForm() + "!/");
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java Mon Apr 26 06:47:29 2010
@@ -450,7 +450,7 @@ public class ProviderWrapper extends Pro
OutputStream out = new FileOutputStream(tempFile);
out.write(ProviderWrapper.class.getName().getBytes());
out.close();
- PROVIDER_URL = tempFile.toURL();
+ PROVIDER_URL = tempFile.toURI().toURL();
} catch (IOException e) {
throw new RuntimeException("Cound not create openejb-jaxws-provider file");
}
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=937937&r1=937936&r2=937937&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 Mon Apr 26 06:47:29 2010
@@ -212,7 +212,7 @@ public class PersistenceUnitInfoImpl imp
}
private URL toUrl(File root) throws MalformedURLException {
- URL url = root.toURL();
+ URL url = root.toURI().toURL();
try {
url.toURI();
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java Mon Apr 26 06:47:29 2010
@@ -43,7 +43,7 @@ public class ConfUtils {
File loginConfig = ConfUtils.install(resource, name);
if (loginConfig != null){
- resource = loginConfig.toURL();
+ resource = loginConfig.toURI().toURL();
}
} catch (IOException e) {
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java Mon Apr 26 06:47:29 2010
@@ -104,7 +104,7 @@ public class UrlCache {
// if the url was successfully cached, process it's manifest classpath
if (file != null) {
try {
- cachedUrls.add(file.toURL());
+ cachedUrls.add(file.toURI().toURL());
// push the manifest classpath on the stack (make sure to maintain the order)
List<URL> manifestClassPath = getManifestClassPath(url, file);
@@ -162,7 +162,7 @@ public class UrlCache {
// Create absolute file URL
sourceFile = sourceFile.getAbsoluteFile();
try {
- url = sourceFile.toURL();
+ url = sourceFile.toURI().toURL();
} catch (MalformedURLException ignored) {
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentLoaderTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentLoaderTest.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentLoaderTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentLoaderTest.java Mon Apr 26 06:47:29 2010
@@ -41,12 +41,12 @@ public class DeploymentLoaderTest extend
* - META-INF/test.env-entry.properties
*/
Map<String, URL> original = new HashMap<String, URL>();
- original.put("ejb-jar.xml", new File("META-INF/ejb-jar.xml").toURL());
- original.put("test.ejb-jar.xml", new File("META-INF/test.ejb-jar.xml").toURL());
- original.put("footest.ejb-jar.xml", new File("META-INF/footest.ejb-jar.xml").toURL());
- original.put("bartest.ejb-jar.xml", new File("META-INF/bartest.ejb-jar.xml").toURL());
- original.put("persistence.xml", new File("META-INF/persistence.xml").toURL());
- original.put("test.env-entry.properties", new File("META-INF/test.env-entry.properties").toURL());
+ original.put("ejb-jar.xml", new File("META-INF/ejb-jar.xml").toURI().toURL());
+ original.put("test.ejb-jar.xml", new File("META-INF/test.ejb-jar.xml").toURI().toURL());
+ original.put("footest.ejb-jar.xml", new File("META-INF/footest.ejb-jar.xml").toURI().toURL());
+ original.put("bartest.ejb-jar.xml", new File("META-INF/bartest.ejb-jar.xml").toURI().toURL());
+ original.put("persistence.xml", new File("META-INF/persistence.xml").toURI().toURL());
+ original.put("test.env-entry.properties", new File("META-INF/test.env-entry.properties").toURI().toURL());
SystemInstance.get().setProperty("openejb.altdd.prefix", "footest, test");
Modified: openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java (original)
+++ openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java Mon Apr 26 06:47:29 2010
@@ -49,7 +49,7 @@ public abstract class BasicURLClassPath
final URL[] jars = new URL[jarNames.length];
for (int j = 0; j < jarNames.length; j++) {
- jars[j] = new File(dir, jarNames[j]).toURL();
+ jars[j] = new File(dir, jarNames[j]).toURI().toURL();
}
sun.misc.URLClassPath path = getURLClassPath(loader);
Modified: openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java (original)
+++ openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java Mon Apr 26 06:47:29 2010
@@ -117,7 +117,7 @@ public class TomcatClassPath extends Bas
}
for (String jarName : jarNames) {
- this.addJarToPath(new File(dir, jarName).toURL());
+ this.addJarToPath(new File(dir, jarName).toURI().toURL());
}
rebuild();
}
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon Apr 26 06:47:29 2010
@@ -93,7 +93,7 @@
<properties>
<!-- This is used by a manifest classpath entry -->
- <xbeanVersion>3.6</xbeanVersion>
+ <xbeanVersion>3.7-SNAPSHOT</xbeanVersion>
<!-- OSGi bundles properties -->
<openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>
Modified: openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java (original)
+++ openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java Mon Apr 26 06:47:29 2010
@@ -451,7 +451,7 @@ public class JaxWsProviderWrapper extend
OutputStream out = new FileOutputStream(tempFile);
out.write(JaxWsProviderWrapper.class.getName().getBytes());
out.close();
- PROVIDER_URL = tempFile.toURL();
+ PROVIDER_URL = tempFile.toURI().toURL();
} catch (IOException e) {
throw new RuntimeException("Cound not create openejb-jaxws-provider file");
}
Modified: openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java (original)
+++ openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java Mon Apr 26 06:47:29 2010
@@ -55,9 +55,9 @@ public class Main {
// Create a child class loader containing the application jar
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
if (classLoader == null) {
- classLoader = new URLClassLoader(new URL[]{file.toURL()});
+ classLoader = new URLClassLoader(new URL[]{file.toURI().toURL()});
} else {
- classLoader = new URLClassLoader(new URL[]{file.toURL()}, classLoader);
+ classLoader = new URLClassLoader(new URL[]{file.toURI().toURL()}, classLoader);
}
Thread.currentThread().setContextClassLoader(classLoader);
Modified: openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java (original)
+++ openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java Mon Apr 26 06:47:29 2010
@@ -863,7 +863,7 @@ public class ResourceFinder {
for (File file : files) {
if (!file.isDirectory()) {
String name = file.getName();
- URL url = file.toURL();
+ URL url = file.toURI().toURL();
resources.put(name, url);
}
}
Modified: openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/httpd/DefaultHttpBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/httpd/DefaultHttpBean.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/httpd/DefaultHttpBean.java (original)
+++ openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/httpd/DefaultHttpBean.java Mon Apr 26 06:47:29 2010
@@ -56,8 +56,8 @@ public class DefaultHttpBean implements
try {
//OpenEJB Home and Base folders
- URL base = SystemInstance.get().getBase().getDirectory().toURL();
- URL home = SystemInstance.get().getHome().getDirectory().toURL();
+ URL base = SystemInstance.get().getBase().getDirectory().toURI().toURL();
+ URL home = SystemInstance.get().getHome().getDirectory().toURI().toURL();
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Modified: openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=937937&r1=937936&r2=937937&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original)
+++ openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Mon Apr 26 06:47:29 2010
@@ -205,7 +205,7 @@ public abstract class WsService implemen
URL moduleBaseUrl = null;
try {
- moduleBaseUrl = new File(ejbJar.jarPath).toURL();
+ moduleBaseUrl = new File(ejbJar.jarPath).toURI().toURL();
} catch (MalformedURLException e) {
logger.error("Invalid ejb jar location " + ejbJar.jarPath, e);
}
@@ -290,7 +290,7 @@ public abstract class WsService implemen
URL moduleBaseUrl = null;
try {
- moduleBaseUrl = new File(webApp.codebase).toURL();
+ moduleBaseUrl = new File(webApp.codebase).toURI().toURL();
} catch (MalformedURLException e) {
logger.error("Invalid ejb jar location " + webApp.codebase, e);
}