You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/04/26 09:01:33 UTC
svn commit: r937941 - in /geronimo/server/trunk:
framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/
framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/
framework/modules/geronimo-shell-base/src/main/java...
Author: djencks
Date: Mon Apr 26 07:01:32 2010
New Revision: 937941
URL: http://svn.apache.org/viewvc?rev=937941&view=rev
Log:
cf OPENEJB-1252 replace file.toURL() with file.toURI().toURL()
Modified:
geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Bootstrapper.java
geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerstrapper.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java
geronimo/server/trunk/plugins/console/geronimo-converter/src/main/java/org/apache/geronimo/converter/bea/Weblogic81Utils.java
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/DeployableFactory.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/ClassLoaderTest.java
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/test/java/org/apache/geronimo/webservices/builder/ParsingTest.java
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java Mon Apr 26 07:01:32 2010
@@ -40,7 +40,7 @@ public class RMIClassLoaderSpiImplTest e
protected void setUp() throws Exception {
File dir = new File(System.getProperty("user.home"));
- baseURL = dir.toURL().toString();
+ baseURL = dir.toURI().toURL().toString();
if (baseURL.endsWith("/")) {
baseURL = baseURL.substring(0, baseURL.length() - 1);
}
Modified: geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Bootstrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Bootstrapper.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Bootstrapper.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Bootstrapper.java Mon Apr 26 07:01:32 2010
@@ -218,7 +218,7 @@ public class Bootstrapper {
parts[3] = fileLocation.getName().substring(fileLocation.getName().lastIndexOf('.') + 1);
String mvnLocation = getMvnLocation(parts);
- Bundle b = context.installBundle(mvnLocation, fileLocation.toURL().openStream());
+ Bundle b = context.installBundle(mvnLocation, fileLocation.toURI().toURL().openStream());
if (b != null) {
b.start(Bundle.START_TRANSIENT);
}
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerstrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerstrapper.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerstrapper.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerstrapper.java Mon Apr 26 07:01:32 2010
@@ -247,7 +247,7 @@ public class StartServerstrapper extends
parts[3] = fileLocation.getName().substring(fileLocation.getName().lastIndexOf('.') + 1);
String mvnLocation = getMvnLocation(parts);
- Bundle b = context.installBundle(mvnLocation, fileLocation.toURL().openStream());
+ Bundle b = context.installBundle(mvnLocation, fileLocation.toURI().toURL().openStream());
if (b != null) {
b.start(Bundle.START_TRANSIENT);
}
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java Mon Apr 26 07:01:32 2010
@@ -132,7 +132,7 @@ public class Axis2WebServiceContainerTes
portInfo.setLocation("/axis2/" + serviceName);
File wsdlFile = new File(RESOURCE_PATH + wsdl);
- portInfo.setWsdlFile(wsdlFile.toURL().toString());
+ portInfo.setWsdlFile(wsdlFile.toURI().toURL().toString());
try {
Axis2Request req = new Axis2Request(504,
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Mon Apr 26 07:01:32 2010
@@ -345,9 +345,6 @@ public class ConnectorModuleBuilderTest
File rarFile = action.getRARFile();
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
-// ClassLoader cl = new URLClassLoader(new URL[]{rarFile.toURL()}, oldCl);
-
-// Thread.currentThread().setContextClassLoader(cl);
JarFile rarJarFile = JarUtils.createJarFile(rarFile);
AbstractName earName = null;
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java Mon Apr 26 07:01:32 2010
@@ -179,7 +179,7 @@ public class RAR_1_5DConfigBeanTest exte
protected void setUp() throws Exception {
File docDir = new File(basedir, "src/test-data/connector_1_5");
- j2eeDD = new File(docDir, "ra.xml").toURL();
+ j2eeDD = new File(docDir, "ra.xml").toURI().toURL();
xmlOptions = new XmlOptions();
xmlOptions.setLoadLineNumbers();
errors = new ArrayList();
Modified: geronimo/server/trunk/plugins/console/geronimo-converter/src/main/java/org/apache/geronimo/converter/bea/Weblogic81Utils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/geronimo-converter/src/main/java/org/apache/geronimo/converter/bea/Weblogic81Utils.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/geronimo-converter/src/main/java/org/apache/geronimo/converter/bea/Weblogic81Utils.java (original)
+++ geronimo/server/trunk/plugins/console/geronimo-converter/src/main/java/org/apache/geronimo/converter/bea/Weblogic81Utils.java Mon Apr 26 07:01:32 2010
@@ -59,7 +59,7 @@ public class Weblogic81Utils {
File state = new File(domainDir, "SerializedSystemIni.dat");
if(!state.canRead()) throw new IllegalArgumentException("Cannot find serialized state in domain directory");
try {
- ClassLoader loader = new URLClassLoader(securityJar.exists() ? new URL[]{weblogicJar.toURL(), securityJar.toURL()} : new URL[]{weblogicJar.toURL()}, Weblogic81Utils.class.getClassLoader());
+ ClassLoader loader = new URLClassLoader(securityJar.exists() ? new URL[]{weblogicJar.toURI().toURL(), securityJar.toURI().toURL()} : new URL[]{weblogicJar.toURI().toURL()}, Weblogic81Utils.class.getClassLoader());
initialize(loader, state);
} catch (Exception e) {
throw (RuntimeException)new IllegalArgumentException("Unable to initialize encryption routines from provided arguments").initCause(e);
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Mon Apr 26 07:01:32 2010
@@ -324,7 +324,7 @@ public class SecurityRealmPortlet extend
ListableRepository repo = repos[i];
File file = repo.getLocation(one);
if (file != null) {
- loader = new URLClassLoader(new URL[]{file.toURL()}, loader);
+ loader = new URLClassLoader(new URL[]{file.toURI().toURL()}, loader);
break;
}
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Mon Apr 26 07:01:32 2010
@@ -376,7 +376,7 @@ public class EARConfigBuilder implements
XmlObject rawPlan;
try {
if (planFile != null) {
- rawPlan = XmlBeansUtil.parse(planFile.toURL(), getClass().getClassLoader());
+ rawPlan = XmlBeansUtil.parse(planFile.toURI().toURL(), getClass().getClassLoader());
gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
if (gerApplication == null) {
return null;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Mon Apr 26 07:01:32 2010
@@ -111,7 +111,7 @@ public class SwitchingModuleBuilder impl
XmlObject xmlObject;
if (plan instanceof File) {
try {
- xmlObject = XmlBeansUtil.parse(((File) plan).toURL(), getClass().getClassLoader());
+ xmlObject = XmlBeansUtil.parse(((File) plan).toURI().toURL(), getClass().getClassLoader());
} catch (IOException e) {
throw new DeploymentException("Could not read plan file", e);
} catch (XmlException e) {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/DeployableFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/DeployableFactory.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/DeployableFactory.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/src/main/java/org/apache/geronimo/deployment/tools/loader/DeployableFactory.java Mon Apr 26 07:01:32 2010
@@ -32,7 +32,7 @@ public class DeployableFactory {
public static DeployableObject createDeployable(Bundle bundle) throws DDBeanCreateException {
if (bundle.getResource("META-INF/application.xml") != null) {
// EAR file
-// return new ApplicationDeployable(moduleFile.toURL());
+// return new ApplicationDeployable(bundle);
throw new UnsupportedOperationException();
} else if (bundle.getResource("META-INF/application-client.xml") != null) {
// Application Client
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java Mon Apr 26 07:01:32 2010
@@ -447,7 +447,7 @@ public class EndpointInfoBuilder {
if (catalogURL == null) {
File f = this.module.getEarContext().getTargetFile(URI.create(name));
if (f.exists()) {
- catalogURL = f.toURL();
+ catalogURL = f.toURI().toURL();
}
}
return catalogURL;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java Mon Apr 26 07:01:32 2010
@@ -104,7 +104,7 @@ public class JAXWSTools {
public static URL[] toURL(File[] jars) throws MalformedURLException {
URL [] urls = new URL[jars.length];
for (int i = 0; i < jars.length; i++) {
- urls[i] = jars[i].toURL();
+ urls[i] = jars[i].toURI().toURL();
}
return urls;
}
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java Mon Apr 26 07:01:32 2010
@@ -420,7 +420,7 @@ public class JettyModuleBuilder extends
rawPlan = (XmlObject) plan;
} else {
if (plan != null) {
- rawPlan = XmlBeansUtil.parse(((File) plan).toURL(), getClass().getClassLoader());
+ rawPlan = XmlBeansUtil.parse(((File) plan).toURI().toURL(), getClass().getClassLoader());
} else {
URL path = deployable.getResource("WEB-INF/geronimo-web.xml");
if (path == null) {
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/ClassLoaderTest.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/ClassLoaderTest.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/ClassLoaderTest.java Mon Apr 26 07:01:32 2010
@@ -50,7 +50,7 @@ public class ClassLoaderTest extends Tes
public void setUp() throws Exception {
super.setUp();
- URL url = new File(BASEDIR, "src/test/resources/deployables/cltest/").toURL();
+ URL url = new File(BASEDIR, "src/test/resources/deployables/cltest/").toURI().toURL();
urls = new URL[]{url};
clRules.setInverseClassLoading(false);
clRules.getHiddenRule().setClassPrefixes(HIDDEN);
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Mon Apr 26 07:01:32 2010
@@ -1228,7 +1228,7 @@ public class DatabasePoolPortlet extends
for (ListableRepository repo : repos) {
File url = repo.getLocation(artifact);
if (url != null) {
- list.add(url.toURL());
+ list.add(url.toURI().toURL());
}
}
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Mon Apr 26 07:01:32 2010
@@ -343,7 +343,7 @@ public class TomcatModuleBuilder extends
rawPlan = (XmlObject) plan;
} else {
if (plan != null) {
- rawPlan = XmlBeansUtil.parse(((File) plan).toURL(), getClass().getClassLoader());
+ rawPlan = XmlBeansUtil.parse(((File) plan).toURI().toURL(), getClass().getClassLoader());
} else {
URL path = deployable.getResource("WEB-INF/geronimo-web.xml");
if (path == null) {
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Mon Apr 26 07:01:32 2010
@@ -126,7 +126,7 @@ public abstract class AbstractWebModuleT
protected TomcatWebAppContext setUpSecureAppContext(Map roleDesignates, Map principalRoleMap, ComponentPermissions componentPermissions, RealmGBean realm, SecurityHolder securityHolder) throws Exception {
ApplicationPolicyConfigurationManager jacc = setUpJACC(roleDesignates, principalRoleMap, componentPermissions, POLICY_CONTEXT_ID);
securityHolder.setConfigurationFactory(this.realm);
- URL configurationBaseURL = new File(BASEDIR, "src/test/resources/deployables/war3/WEB-INF/web.xml").toURL();
+ URL configurationBaseURL = new File(BASEDIR, "src/test/resources/deployables/war3/WEB-INF/web.xml").toURI().toURL();
return setUpInsecureAppContext("war3",
configurationBaseURL,
securityHolder,
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/test/java/org/apache/geronimo/webservices/builder/ParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/test/java/org/apache/geronimo/webservices/builder/ParsingTest.java?rev=937941&r1=937940&r2=937941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/test/java/org/apache/geronimo/webservices/builder/ParsingTest.java (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/test/java/org/apache/geronimo/webservices/builder/ParsingTest.java Mon Apr 26 07:01:32 2010
@@ -68,7 +68,7 @@ public class ParsingTest
}
private Map parse(File schema1) throws IOException, XmlException, DeploymentException, URISyntaxException {
- XmlObject xmlObject = XmlBeansUtil.parse(schema1.toURL(), getClass().getClassLoader());
+ XmlObject xmlObject = XmlBeansUtil.parse(schema1.toURI().toURL(), getClass().getClassLoader());
Collection errors = new ArrayList();
XmlOptions xmlOptions = new XmlOptions();
xmlOptions.setErrorListener(errors);