Author: jboynes
Date: Thu Mar 23 09:24:12 2006
New Revision: 388218
URL: http://svn.apache.org/viewcvs?rev=388218&view=rev
Log:
apply patch for TUSCANY-128 from Daniel Kulp
Modified:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/ClassLoaderObjectInputStream.java
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/FixedURLClassLoader.java
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/monitor/impl/JavaLoggingMonitorFactory.java
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/resource/impl/ResourceLoaderImpl.java
incubator/tuscany/java/sca/common/src/test/java/org/apache/tuscany/common/monitor/impl/JavaLoggingTestCase.java
Modified:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java?rev=388218&r1=388217&r2=388218&view=diff
==============================================================================
---
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java
(original)
+++
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyException.java
Thu Mar 23 09:24:12 2006
@@ -34,7 +34,7 @@
*/
public List<String> returnContextNames(String name) {
if (contextStack == null) {
- contextStack = new ArrayList();
+ contextStack = new ArrayList<String>();
}
return contextStack;
}
@@ -44,7 +44,7 @@
*/
public void addContextName(String name) {
if (contextStack == null) {
- contextStack = new ArrayList();
+ contextStack = new ArrayList<String>();
}
contextStack.add(name);
}
Modified:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java?rev=388218&r1=388217&r2=388218&view=diff
==============================================================================
---
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java
(original)
+++
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java
Thu Mar 23 09:24:12 2006
@@ -39,7 +39,7 @@
*/
public List<String> returnContextNames(String name) {
if (contextStack == null) {
- contextStack = new ArrayList();
+ contextStack = new ArrayList<String>();
}
return contextStack;
}
@@ -49,7 +49,7 @@
*/
public void addContextName(String name) {
if (contextStack == null) {
- contextStack = new ArrayList();
+ contextStack = new ArrayList<String>();
}
contextStack.add(name);
}
Modified:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/ClassLoaderObjectInputStream.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/ClassLoaderObjectInputStream.java?rev=388218&r1=388217&r2=388218&view=diff
==============================================================================
---
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/ClassLoaderObjectInputStream.java
(original)
+++
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/ClassLoaderObjectInputStream.java
Thu Mar 23 09:24:12 2006
@@ -47,12 +47,12 @@
/**
* @see java.io.ObjectInputStream#resolveClass(java.io.ObjectStreamClass)
*/
- protected Class resolveClass(final ObjectStreamClass desc) throws
IOException, ClassNotFoundException {
+ protected Class<?> resolveClass(final ObjectStreamClass desc) throws
IOException, ClassNotFoundException {
final String name = desc.getName();
try {
- return (Class) AccessController.doPrivileged(new
PrivilegedExceptionAction() {
- public Object run() throws ClassNotFoundException, IOException
{
+ return AccessController.doPrivileged(new
PrivilegedExceptionAction<Class<?>>() {
+ public Class<?> run() throws ClassNotFoundException,
IOException {
try {
return Class.forName(name, false, classLoader);
} catch (ClassNotFoundException e) {
Modified:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/FixedURLClassLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/FixedURLClassLoader.java?rev=388218&r1=388217&r2=388218&view=diff
==============================================================================
---
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/FixedURLClassLoader.java
(original)
+++
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/io/util/FixedURLClassLoader.java
Thu Mar 23 09:24:12 2006
@@ -29,6 +29,7 @@
import java.net.URLStreamHandler;
import java.net.URLStreamHandlerFactory;
import java.security.Permission;
+import java.util.List;
import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -177,7 +178,7 @@
return connection.getHeaderFieldKey(n);
}
- public Map getHeaderFields() {
+ public Map<String, List<String>> getHeaderFields() {
return connection.getHeaderFields();
}
@@ -253,7 +254,7 @@
return connection.getPermission();
}
- public Map getRequestProperties() {
+ public Map<String, List<String>> getRequestProperties() {
return connection.getRequestProperties();
}
Modified:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/monitor/impl/JavaLoggingMonitorFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/monitor/impl/JavaLoggingMonitorFactory.java?rev=388218&r1=388217&r2=388218&view=diff
==============================================================================
---
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/monitor/impl/JavaLoggingMonitorFactory.java
(original)
+++
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/monitor/impl/JavaLoggingMonitorFactory.java
Thu Mar 23 09:24:12 2006
@@ -41,7 +41,7 @@
private final Level defaultLevel;
private final Map<String, Level> levels;
- private final Map<Class<?>, WeakReference<?>> proxies = new WeakHashMap();
+ private final Map<Class<?>, WeakReference<?>> proxies = new
WeakHashMap<Class<?>, WeakReference<?>>();
/**
*
@@ -52,7 +52,7 @@
public JavaLoggingMonitorFactory(Properties levels, Level defaultLevel,
String bundleName) {
this.defaultLevel = defaultLevel;
this.bundleName = bundleName;
- this.levels = new HashMap(levels.size());
+ this.levels = new HashMap<String, Level>(levels.size());
for (Iterator<Map.Entry<Object, Object>> i =
levels.entrySet().iterator(); i.hasNext();) {
Map.Entry<Object, Object> entry = i.next();
String method = (String) entry.getKey();
@@ -69,21 +69,21 @@
T proxy = getCachedMonitor(monitorInterface);
if (proxy == null) {
proxy = createMonitor(monitorInterface);
- proxies.put(monitorInterface, new WeakReference(proxy));
+ proxies.put(monitorInterface, new WeakReference<T>(proxy));
}
return proxy;
}
private <T>T getCachedMonitor(Class<T> monitorInterface) {
- WeakReference<T> ref = (WeakReference<T>)
proxies.get(monitorInterface);
- return (ref != null) ? ref.get() : null;
+ WeakReference<?> ref = (WeakReference<?>)proxies.get(monitorInterface);
+ return (ref != null) ? monitorInterface.cast(ref.get()) : null;
}
private <T>T createMonitor(Class<T> monitorInterface) {
String className = monitorInterface.getName();
Logger logger = Logger.getLogger(className, bundleName);
Method[] methods = monitorInterface.getMethods();
- Map<String, Level> levels = new HashMap(methods.length);
+ Map<String, Level> levels = new HashMap<String, Level>(methods.length);
for (int i = 0; i < methods.length; i++) {
Method method = methods[i];
String key = className + '#' + method.getName();
@@ -106,7 +106,7 @@
}
}
InvocationHandler handler = new LoggingHandler(logger, levels);
- return (T) Proxy.newProxyInstance(monitorInterface.getClassLoader(),
new Class<?>[]{monitorInterface}, handler);
+ return
monitorInterface.cast(Proxy.newProxyInstance(monitorInterface.getClassLoader(),
new Class<?>[]{monitorInterface}, handler));
}
private static final class LoggingHandler implements InvocationHandler {
Modified:
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/resource/impl/ResourceLoaderImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/resource/impl/ResourceLoaderImpl.java?rev=388218&r1=388217&r2=388218&view=diff
==============================================================================
---
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/resource/impl/ResourceLoaderImpl.java
(original)
+++
incubator/tuscany/java/sca/common/src/main/java/org/apache/tuscany/common/resource/impl/ResourceLoaderImpl.java
Thu Mar 23 09:24:12 2006
@@ -66,10 +66,14 @@
* @param classLoader
*/
public ResourceLoaderImpl(ClassLoader classLoader) {
- classLoaderReference = new WeakReference(classLoader);
- generatedClassLoaderReference = new WeakReference(new
GeneratedClassLoader(classLoader));
+ classLoaderReference = new WeakReference<ClassLoader>(classLoader);
+ generatedClassLoaderReference = new
WeakReference<GeneratedClassLoader>(new GeneratedClassLoader(classLoader));
ClassLoader parentCL = classLoader.getParent();
- parents = parentCL == null ? Collections.EMPTY_LIST :
Collections.singletonList(new ResourceLoaderImpl(parentCL));
+ if (null == parentCL) {
+ parents = Collections.emptyList();
+ } else {
+ parents = Collections.singletonList((ResourceLoader)new
ResourceLoaderImpl(parentCL));
+ }
}
@@ -92,7 +96,7 @@
return parents;
}
- public Class loadClass(String name) throws ClassNotFoundException {
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
GeneratedClassLoader cl = generatedClassLoaderReference.get();
if (cl != null) {
return Class.forName(name, true, cl);
@@ -105,7 +109,7 @@
GeneratedClassLoader cl = generatedClassLoaderReference.get();
if (cl == null) {
cl=new GeneratedClassLoader(getClassLoader());
- generatedClassLoaderReference = new WeakReference(cl);
+ generatedClassLoaderReference = new
WeakReference<GeneratedClassLoader>(cl);
}
return cl.addClass(bytes);
}
@@ -115,7 +119,7 @@
// to ask for the same resource multiple times.
// Create a new set, add all the resources visible from the current
ClassLoader
- Set<URL> set = new HashSet();
+ Set<URL> set = new HashSet<URL>();
ClassLoader classLoader = getClassLoader();
for (Enumeration<URL> e = classLoader.getResources(name);
e.hasMoreElements();) {
set.add(e.nextElement());
@@ -131,7 +135,7 @@
}
public Iterator<URL> getAllResources(String name) throws IOException {
- return new EnumerationIterator(getClassLoader().getResources(name));
+ return new
EnumerationIterator<URL>(getClassLoader().getResources(name));
}
public URL getResource(String name) throws IOException {
Modified:
incubator/tuscany/java/sca/common/src/test/java/org/apache/tuscany/common/monitor/impl/JavaLoggingTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/common/src/test/java/org/apache/tuscany/common/monitor/impl/JavaLoggingTestCase.java?rev=388218&r1=388217&r2=388218&view=diff
==============================================================================
---
incubator/tuscany/java/sca/common/src/test/java/org/apache/tuscany/common/monitor/impl/JavaLoggingTestCase.java
(original)
+++
incubator/tuscany/java/sca/common/src/test/java/org/apache/tuscany/common/monitor/impl/JavaLoggingTestCase.java
Thu Mar 23 09:24:12 2006
@@ -114,7 +114,7 @@
}
public static class MockHandler extends Handler {
- List<LogRecord> logs = new ArrayList();
+ List<LogRecord> logs = new ArrayList<LogRecord>();
public void publish(LogRecord record) {
logs.add(record);
