Author: sagara
Date: Thu Jun 21 07:02:58 2012
New Revision: 1352428
URL: http://svn.apache.org/viewvc?rev=1352428&view=rev
Log:
Replaced use of deprecated File# toURI() by to File#URI().toURL()
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceHandle.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceLocation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlConnection.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlStreamHandler.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceHandle.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceHandle.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceHandle.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceHandle.java
Thu Jun 21 07:02:58 2012
@@ -39,9 +39,9 @@ public class DirectoryResourceHandle ext
public DirectoryResourceHandle(String name, File file, File codeSource,
Manifest manifest) throws MalformedURLException {
this.name = name;
this.file = file;
- this.codeSource = codeSource.toURL();
+ this.codeSource = codeSource.toURI().toURL();
this.manifest = manifest;
- url = file.toURL();
+ url = file.toURI().toURL();
}
public String getName() {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceLocation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceLocation.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceLocation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/DirectoryResourceLocation.java
Thu Jun 21 07:02:58 2012
@@ -31,7 +31,7 @@ public class DirectoryResourceLocation e
private Manifest manifest;
public DirectoryResourceLocation(File baseDir) throws
MalformedURLException {
- super(baseDir.toURL());
+ super(baseDir.toURI().toURL());
this.baseDir = baseDir;
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlConnection.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlConnection.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlConnection.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlConnection.java
Thu Jun 21 07:02:58 2012
@@ -66,7 +66,7 @@ public class JarFileUrlConnection extend
this.url = url;
this.jarFile = jarFile;
this.jarEntry = jarEntry;
- jarFileUrl = new File(jarFile.getName()).toURL();
+ jarFileUrl = new File(jarFile.getName()).toURI().toURL();
}
public JarFile getJarFile() throws IOException {
@@ -125,7 +125,7 @@ public class JarFileUrlConnection extend
}
public Permission getPermission() throws IOException {
- URL jarFileUrl = new File(jarFile.getName()).toURL();
+ URL jarFileUrl = new File(jarFile.getName()).toURI().toURL();
return jarFileUrl.openConnection().getPermission();
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlStreamHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlStreamHandler.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlStreamHandler.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileUrlStreamHandler.java
Thu Jun 21 07:02:58 2012
@@ -34,7 +34,7 @@ import java.util.jar.JarFile;
*/
public class JarFileUrlStreamHandler extends URLStreamHandler {
public static URL createUrl(JarFile jarFile, JarEntry jarEntry) throws
MalformedURLException {
- return createUrl(jarFile, jarEntry, new
File(jarFile.getName()).toURL());
+ return createUrl(jarFile, jarEntry, new
File(jarFile.getName()).toURI().toURL());
}
public static URL createUrl(JarFile jarFile, JarEntry jarEntry, URL
codeSource) throws MalformedURLException {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Thu Jun 21 07:02:58 2012
@@ -154,7 +154,7 @@ public abstract class DeploymentEngine i
.calculateDefaultModuleVersion(axisConfig.getModules(),
axisConfig);
try {
try {
- axisConfig.setRepository(axisRepo.toURL());
+ axisConfig.setRepository(axisRepo.toURI().toURL());
} catch (MalformedURLException e) {
log.info(e.getMessage());
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
Thu Jun 21 07:02:58 2012
@@ -138,7 +138,7 @@ public class ModuleDeployer extends Abst
metaData.setModuleClassLoader(deploymentFileData.getClassLoader());
metaData.setParent(axisConfig);
archiveReader.readModuleArchive(deploymentFileData, metaData,
isDirectory, axisConfig);
- URL url = deploymentFile.toURL();
+ URL url = deploymentFile.toURI().toURL();
metaData.setFileName(url);
DeploymentEngine.addNewModule(metaData, axisConfig);
super.deploy(deploymentFileData);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
Thu Jun 21 07:02:58 2012
@@ -95,7 +95,7 @@ public class POJODeployer extends Abstra
axisService =
createAxisServiceUsingAnnogen(className,
classLoader,
- deploymentFileData.getFile().toURL());
+
deploymentFileData.getFile().toURI().toURL());
//add the hierarchical path to the service name
axisService.setName(serviceHierarchy + axisService.getName());
@@ -106,11 +106,11 @@ public class POJODeployer extends Abstra
ArrayList<AxisService> axisServiceList = new
ArrayList<AxisService>();
for (String className : classList) {
ArrayList<URL> urls = new ArrayList<URL>();
- urls.add(deploymentFileData.getFile().toURL());
+ urls.add(deploymentFileData.getFile().toURI().toURL());
urls.add(configCtx.getAxisConfiguration().getRepository());
String webLocation =
DeploymentEngine.getWebLocationString();
if (webLocation != null) {
- urls.add(new File(webLocation).toURL());
+ urls.add(new File(webLocation).toURI().toURL());
}
ClassLoader classLoader = Utils.createClassLoader(
urls,
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Thu Jun 21 07:02:58 2012
@@ -25,7 +25,6 @@ import org.apache.axis2.deployment.repos
import org.apache.axis2.deployment.repository.util.WSInfoList;
import org.apache.axis2.deployment.util.Utils;
import org.apache.axis2.util.Loader;
-import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,9 +35,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLDecoder;
-import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Map;
public class RepositoryListener implements DeploymentConstants {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
Thu Jun 21 07:02:58 2012
@@ -155,7 +155,7 @@ public class ServiceDeployer extends Abs
serviceMetaData, deploymentFileData,
serviceGroup, isDirectory, serviceMap,
configCtx);
- URL location = deploymentFileData.getFile().toURL();
+ URL location = deploymentFileData.getFile().toURI().toURL();
// Add the hierarchical path to the service group
if (location != null) {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
Thu Jun 21 07:02:58 2012
@@ -118,7 +118,7 @@ public class DeploymentFileData {
throw new
AxisFault(Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND,
this.file.getAbsolutePath()));
}
- urlsToLoadFrom = new URL[]{this.file.toURL()};
+ urlsToLoadFrom = new URL[]{this.file.toURI().toURL()};
classLoader = Utils.createClassLoader(urlsToLoadFrom,
parent, true, file, isChildFirstClassLoading);
} catch (Exception e) {
throw AxisFault.makeFault(e);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=1352428&r1=1352427&r2=1352428&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Thu Jun 21 07:02:58 2012
@@ -171,7 +171,7 @@ public class Utils {
return new FileInputStream(f);
}
});
- array.add(f.toURL());
+ array.add(f.toURI().toURL());
zin = new ZipInputStream(fin);
ZipEntry entry;
@@ -187,7 +187,7 @@ public class Utils {
&& entryName.toLowerCase().endsWith(".jar")) {
String suffix = entryName.substring(4);
File f2 = createTempFile(suffix, zin, tmpDir);
- array.add(f2.toURL());
+ array.add(f2.toURI().toURL());
}
}
return (URL[])array.toArray(new URL[array.size()]);
@@ -328,7 +328,7 @@ public class Utils {
try {
ArrayList urls = new ArrayList();
- urls.add(file.toURL());
+ urls.add(file.toURI().toURL());
// lower case directory name
File libfiles = new File(file, "lib");
@@ -381,7 +381,7 @@ public class Utils {
}
});
if (exists) {
- urls.add(libfiles.toURL());
+ urls.add(libfiles.toURI().toURL());
File jarfiles[] =
(File[])org.apache.axis2.java.security.AccessController
.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -392,7 +392,7 @@ public class Utils {
while (i < jarfiles.length) {
File jarfile = jarfiles[i];
if (jarfile.getName().endsWith(".jar")) {
- urls.add(jarfile.toURL());
+ urls.add(jarfile.toURI().toURL());
}
i++;
}
@@ -798,7 +798,7 @@ public class Utils {
return
Thread.currentThread().getContextClassLoader();
}
});
- return createDeploymentClassLoader(new URL[]{serviceFile.toURL()},
+ return createDeploymentClassLoader(new
URL[]{serviceFile.toURI().toURL()},
contextClassLoader, new
ArrayList(), isChildFirstClassLoading);
}
