You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2010/11/04 00:48:49 UTC
svn commit: r1030761 [2/2] - in /incubator/aries/trunk: ./ blueprint/
blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/
blueprint/blueprint-bundle/ blueprint/blueprint-bundle/src/main/java/
blueprint/blueprint-bundle/src/main/...
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassBytecodeGenerationException.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassBytecodeGenerationException.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassBytecodeGenerationException.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassBytecodeGenerationException.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassBytecodeGenerationException.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassBytecodeGenerationException.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassBytecodeGenerationException.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
+
+import org.apache.aries.proxy.UnableToProxyException;
public class ProxyClassBytecodeGenerationException extends UnableToProxyException
{
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassDefinitionException.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassDefinitionException.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassDefinitionException.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassDefinitionException.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassDefinitionException.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassDefinitionException.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassDefinitionException.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
+
+import org.apache.aries.proxy.UnableToProxyException;
public class ProxyClassDefinitionException extends UnableToProxyException
{
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassInstantiationException.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassInstantiationException.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassInstantiationException.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassInstantiationException.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassInstantiationException.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxyClassInstantiationException.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxyClassInstantiationException.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
+
+import org.apache.aries.proxy.UnableToProxyException;
public class ProxyClassInstantiationException extends UnableToProxyException
{
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassAdapter.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassAdapter.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
import java.io.IOException;
import java.lang.reflect.InvocationHandler;
@@ -65,7 +65,7 @@ public class ProxySubclassAdapter extend
super(writer);
// the writer is now the cv in the superclass of ClassAdapter
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "ProxySubclassAdapter", new Object[] { this, writer,
+ LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassAdapter", new Object[] { this, writer,
newClassName });
// set the newClassName field
@@ -76,7 +76,7 @@ public class ProxySubclassAdapter extend
// set the classloader
this.loader = loader;
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "ProxySubclassAdapter", this);
+ LOGGER.debug(Constants.LOG_EXIT, "ProxySubclassAdapter", this);
}
/*
@@ -96,7 +96,7 @@ public class ProxySubclassAdapter extend
public void visit(int version, int access, String name, String signature, String superName,
String[] interfaces)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "visit", new Object[] { version, access, name,
+ LOGGER.debug(Constants.LOG_ENTRY, "visit", new Object[] { version, access, name,
signature, superName, interfaces });
// store the superclass binary name
@@ -235,23 +235,23 @@ public class ProxySubclassAdapter extend
// now we are ready to visit all the methods on the lowest class
// which will happen by the ASM ClassVisitor implemented in this adapter
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "visit");
+ LOGGER.debug(Constants.LOG_EXIT, "visit");
}
public void visitSource(String source, String debug)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "visitSource", new Object[] { source, debug });
+ LOGGER.debug(Constants.LOG_ENTRY, "visitSource", new Object[] { source, debug });
// set the source to null since the class is generated on the fly and
// not compiled
cv.visitSource(null, null);
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "visitSource");
+ LOGGER.debug(Constants.LOG_EXIT, "visitSource");
}
public void visitEnd()
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "visitEnd");
+ LOGGER.debug(Constants.LOG_ENTRY, "visitEnd");
// this method is called when we reach the end of the class
// so it is time to make sure the static initialiser method is closed
@@ -260,7 +260,7 @@ public class ProxySubclassAdapter extend
// now delegate to the cv
cv.visitEnd();
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "visitEnd");
+ LOGGER.debug(Constants.LOG_EXIT, "visitEnd");
}
/*
@@ -272,7 +272,7 @@ public class ProxySubclassAdapter extend
public MethodVisitor visitMethod(int access, String name, String desc, String signature,
String[] exceptions)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "visitMethod", new Object[] { access, name, desc,
+ LOGGER.debug(Constants.LOG_ENTRY, "visitMethod", new Object[] { access, name, desc,
signature, exceptions });
/*
@@ -343,7 +343,7 @@ public class ProxySubclassAdapter extend
methodVisitorToReturn = null;
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "visitMethod", methodVisitorToReturn);
+ LOGGER.debug(Constants.LOG_EXIT, "visitMethod", methodVisitorToReturn);
return methodVisitorToReturn;
@@ -352,7 +352,7 @@ public class ProxySubclassAdapter extend
private void processMethod(int access, String name, String desc, String signature,
String[] exceptions)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "processMethod", new Object[] { access, name, desc,
+ LOGGER.debug(Constants.LOG_ENTRY, "processMethod", new Object[] { access, name, desc,
signature, exceptions });
LOGGER.debug("Processing method: {} with descriptor {}", name, desc);
@@ -541,12 +541,12 @@ public class ProxySubclassAdapter extend
// end the method
methodAdapter.endMethod();
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "processMethod");
+ LOGGER.debug(Constants.LOG_EXIT, "processMethod");
}
private void addClassStaticField(String classBinaryName)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "addClassStaticField",
+ LOGGER.debug(Constants.LOG_ENTRY, "addClassStaticField",
new Object[] { classBinaryName });
currentClassFieldName = classBinaryName.replaceAll("\\.", "_");
@@ -574,18 +574,18 @@ public class ProxySubclassAdapter extend
// put the Class in the static field
staticAdapter.putStatic(newClassType, currentClassFieldName, CLASS_TYPE);
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "addClassStaticField");
+ LOGGER.debug(Constants.LOG_ENTRY, "addClassStaticField");
}
private void setCurrentAnalysisClassFields(Class<?> aClass)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "setCurrentAnalysisClassFields",
+ LOGGER.debug(Constants.LOG_ENTRY, "setCurrentAnalysisClassFields",
new Object[] { aClass });
currentlyAnalysedClassName = aClass.getName();
currentlyAnalysedClass = aClass;
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "setCurrentAnalysisClassFields");
+ LOGGER.debug(Constants.LOG_EXIT, "setCurrentAnalysisClassFields");
}
// we don't want to copy fields from the class into the proxy
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassGenerator.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassGenerator.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassGenerator.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassGenerator.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassGenerator.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassGenerator.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
import static java.lang.reflect.Modifier.isFinal;
@@ -34,6 +34,8 @@ import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.aries.proxy.FinalModifierException;
+import org.apache.aries.proxy.UnableToProxyException;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
@@ -66,7 +68,7 @@ public class ProxySubclassGenerator
public static Class<?> getProxySubclass(Class<?> aClass) throws UnableToProxyException
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "getProxySubclass", new Object[] { aClass });
+ LOGGER.debug(Constants.LOG_ENTRY, "getProxySubclass", new Object[] { aClass });
ClassLoader loader = aClass.getClassLoader();
// in the special case where the loader is null we use a default classloader
@@ -108,7 +110,7 @@ public class ProxySubclassGenerator
try {
classToReturn = loader.loadClass(className);
} catch (ClassNotFoundException cnfe) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, cnfe);
+ LOGGER.debug(Constants.LOG_EXCEPTION, cnfe);
throw new UnableToLoadProxyException(className, cnfe);
}
} else {
@@ -138,7 +140,7 @@ public class ProxySubclassGenerator
}
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "getProxySubclass", classToReturn);
+ LOGGER.debug(Constants.LOG_EXIT, "getProxySubclass", classToReturn);
return classToReturn;
}
@@ -147,7 +149,7 @@ public class ProxySubclassGenerator
throws UnableToProxyException
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "newProxySubclassInstance", new Object[] {
+ LOGGER.debug(Constants.LOG_ENTRY, "newProxySubclassInstance", new Object[] {
classToProxy, ih });
Object proxySubclassInstance = null;
@@ -160,20 +162,20 @@ public class ProxySubclassGenerator
proxySubclassInstance = subclassConstructor.newInstance(ih);
LOGGER.debug("Invoked proxy subclass constructor");
} catch (NoSuchMethodException nsme) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, nsme);
+ LOGGER.debug(Constants.LOG_EXCEPTION, nsme);
throw new ProxyClassInstantiationException(classToProxy, nsme);
} catch (InvocationTargetException ite) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, ite);
+ LOGGER.debug(Constants.LOG_EXCEPTION, ite);
throw new ProxyClassInstantiationException(classToProxy, ite);
} catch (InstantiationException ie) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, ie);
+ LOGGER.debug(Constants.LOG_EXCEPTION, ie);
throw new ProxyClassInstantiationException(classToProxy, ie);
} catch (IllegalAccessException iae) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, iae);
+ LOGGER.debug(Constants.LOG_EXCEPTION, iae);
throw new ProxyClassInstantiationException(classToProxy, iae);
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "newProxySubclassInstance", proxySubclassInstance);
+ LOGGER.debug(Constants.LOG_EXIT, "newProxySubclassInstance", proxySubclassInstance);
return proxySubclassInstance;
}
@@ -181,7 +183,7 @@ public class ProxySubclassGenerator
private static Class<?> generateAndLoadSubclass(Class<?> aClass, ClassLoader loader)
throws UnableToProxyException
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "generateAndLoadSubclass", new Object[] { aClass,
+ LOGGER.debug(Constants.LOG_ENTRY, "generateAndLoadSubclass", new Object[] { aClass,
loader });
// set the newClassName
@@ -207,38 +209,38 @@ public class ProxySubclassGenerator
clazz = loadClassFromBytes(loader, getBinaryName(fullNewClassName), byteClassData, aClass
.getName());
} catch (IOException ioe) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, ioe);
+ LOGGER.debug(Constants.LOG_EXCEPTION, ioe);
throw new ProxyClassBytecodeGenerationException(aClass.getName(), ioe);
} catch (TypeNotPresentException tnpe) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, tnpe);
+ LOGGER.debug(Constants.LOG_EXCEPTION, tnpe);
throw new ProxyClassBytecodeGenerationException(tnpe.typeName(), tnpe.getCause());
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "generateAndLoadSubclass", clazz);
+ LOGGER.debug(Constants.LOG_EXIT, "generateAndLoadSubclass", clazz);
return clazz;
}
private static byte[] processClass(ClassReader cReader, ClassWriter cWriter, ClassVisitor cVisitor)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "processClass", new Object[] { cReader, cWriter,
+ LOGGER.debug(Constants.LOG_ENTRY, "processClass", new Object[] { cReader, cWriter,
cVisitor });
cReader.accept(cVisitor, ClassReader.SKIP_DEBUG);
byte[] byteClassData = cWriter.toByteArray();
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "processClass", byteClassData);
+ LOGGER.debug(Constants.LOG_EXIT, "processClass", byteClassData);
return byteClassData;
}
private static String getBinaryName(String name)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "getBinaryName", name);
+ LOGGER.debug(Constants.LOG_ENTRY, "getBinaryName", name);
String binaryName = name.replaceAll("/", "\\.");
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "getBinaryName", binaryName);
+ LOGGER.debug(Constants.LOG_EXIT, "getBinaryName", binaryName);
return binaryName;
}
@@ -246,7 +248,7 @@ public class ProxySubclassGenerator
private static Class<?> loadClassFromBytes(ClassLoader loader, String name, byte[] classData,
String classToProxyName) throws UnableToProxyException
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "loadClassFromBytes", new Object[] { loader, name,
+ LOGGER.debug(Constants.LOG_ENTRY, "loadClassFromBytes", new Object[] { loader, name,
classData });
Class<?> clazz = null;
@@ -260,27 +262,27 @@ public class ProxySubclassGenerator
ProxySubclassGenerator.class.getProtectionDomain());
defineClassMethod.setAccessible(false);
} catch (ClassNotFoundException cnfe) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, cnfe);
+ LOGGER.debug(Constants.LOG_EXCEPTION, cnfe);
throw new ProxyClassDefinitionException(classToProxyName, cnfe);
} catch (NoSuchMethodException nsme) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, nsme);
+ LOGGER.debug(Constants.LOG_EXCEPTION, nsme);
throw new ProxyClassDefinitionException(classToProxyName, nsme);
} catch (InvocationTargetException ite) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, ite);
+ LOGGER.debug(Constants.LOG_EXCEPTION, ite);
throw new ProxyClassDefinitionException(classToProxyName, ite);
} catch (IllegalAccessException iae) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, iae);
+ LOGGER.debug(Constants.LOG_EXCEPTION, iae);
throw new ProxyClassDefinitionException(classToProxyName, iae);
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "loadClassFromBytes", clazz);
+ LOGGER.debug(Constants.LOG_EXIT, "loadClassFromBytes", clazz);
return clazz;
}
public static boolean isProxySubclass(Class<?> aClass)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "isProxySubclass", new Object[] { aClass });
+ LOGGER.debug(Constants.LOG_ENTRY, "isProxySubclass", new Object[] { aClass });
// We will always have a proxy map for the class loader of any proxy
// class, so if
@@ -289,14 +291,14 @@ public class ProxySubclassGenerator
boolean isProxySubclass = (proxies != null && proxies.containsValue(aClass.getName()));
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "isProxySubclass", isProxySubclass);
+ LOGGER.debug(Constants.LOG_EXIT, "isProxySubclass", isProxySubclass);
return isProxySubclass;
}
private static void scanForFinalModifiers(Class<?> clazz) throws FinalModifierException
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "scanForFinalModifiers", new Object[] { clazz });
+ LOGGER.debug(Constants.LOG_ENTRY, "scanForFinalModifiers", new Object[] { clazz });
if (isFinal(clazz.getModifiers())) {
throw new FinalModifierException(clazz);
@@ -323,13 +325,13 @@ public class ProxySubclassGenerator
throw new FinalModifierException(clazz, methodList);
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "scanForFinalModifiers");
+ LOGGER.debug(Constants.LOG_EXIT, "scanForFinalModifiers");
}
public static InvocationHandler getInvocationHandler(Object o)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "getInvoationHandler", new Object[] { o });
+ LOGGER.debug(Constants.LOG_ENTRY, "getInvoationHandler", new Object[] { o });
InvocationHandler ih = null;
if (isProxySubclass(o.getClass())) {
@@ -342,18 +344,18 @@ public class ProxySubclassGenerator
ih = (InvocationHandler) o.getClass().getDeclaredMethod("getInvocationHandler",
new Class[] {}).invoke(o, new Object[] {});
} catch (IllegalArgumentException e) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, e);
+ LOGGER.debug(Constants.LOG_EXCEPTION, e);
} catch (SecurityException e) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, e);
+ LOGGER.debug(Constants.LOG_EXCEPTION, e);
} catch (IllegalAccessException e) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, e);
+ LOGGER.debug(Constants.LOG_EXCEPTION, e);
} catch (InvocationTargetException e) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, e);
+ LOGGER.debug(Constants.LOG_EXCEPTION, e);
} catch (NoSuchMethodException e) {
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXCEPTION, e);
+ LOGGER.debug(Constants.LOG_EXCEPTION, e);
}
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "getInvoationHandler", ih);
+ LOGGER.debug(Constants.LOG_EXIT, "getInvoationHandler", ih);
return ih;
}
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassHierarchyAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassHierarchyAdapter.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassHierarchyAdapter.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
import java.util.Collection;
@@ -47,19 +47,19 @@ public class ProxySubclassHierarchyAdapt
ProxySubclassHierarchyAdapter(ProxySubclassAdapter adapter, Collection<String> methodsToImplement)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "ProxySubclassHeirarchyAdapter", new Object[] {
+ LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassHeirarchyAdapter", new Object[] {
this, adapter, methodsToImplement });
this.methodsToImplement = methodsToImplement;
this.adapter = adapter;
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "ProxySubclassHeirarchyAdapter", this);
+ LOGGER.debug(Constants.LOG_EXIT, "ProxySubclassHeirarchyAdapter", this);
}
public MethodVisitor visitMethod(int access, String name, String desc, String signature,
String[] exceptions)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "visitMethod", new Object[] { access, name, desc,
+ LOGGER.debug(Constants.LOG_ENTRY, "visitMethod", new Object[] { access, name, desc,
signature, exceptions });
// if the method we find in the superclass is one that is available on
@@ -73,7 +73,7 @@ public class ProxySubclassHierarchyAdapt
adapter.visitMethod(access, name, desc, signature, exceptions);
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "visitMethod");
+ LOGGER.debug(Constants.LOG_EXIT, "visitMethod");
// always return null because we don't want to copy any method code
return null;
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassMethodHashSet.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassMethodHashSet.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassMethodHashSet.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassMethodHashSet.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassMethodHashSet.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/ProxySubclassMethodHashSet.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassMethodHashSet.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
import java.util.HashSet;
@@ -37,7 +37,7 @@ public class ProxySubclassMethodHashSet<
public void addMethodArray(java.lang.reflect.Method[] arrayOfEntries)
{
- LOGGER.debug(AsmInterceptorWrapper.LOG_ENTRY, "addMethodArray", new Object[] { arrayOfEntries });
+ LOGGER.debug(Constants.LOG_ENTRY, "addMethodArray", new Object[] { arrayOfEntries });
for (java.lang.reflect.Method entry : arrayOfEntries) {
String methodName = entry.getName();
@@ -54,7 +54,7 @@ public class ProxySubclassMethodHashSet<
LOGGER.debug("Added: {}", added);
}
- LOGGER.debug(AsmInterceptorWrapper.LOG_EXIT, "addMethodArray");
+ LOGGER.debug(Constants.LOG_EXIT, "addMethodArray");
}
static String typeArrayToStringArgDescriptor(Type[] argTypes)
Copied: incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/UnableToLoadProxyException.java (from r1027453, incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/UnableToLoadProxyException.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/UnableToLoadProxyException.java?p2=incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/UnableToLoadProxyException.java&p1=incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/UnableToLoadProxyException.java&r1=1027453&r2=1030761&rev=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/UnableToLoadProxyException.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/UnableToLoadProxyException.java Wed Nov 3 23:48:47 2010
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.blueprint.proxy;
+package org.apache.aries.proxy.impl.gen;
+
+import org.apache.aries.proxy.UnableToProxyException;
public class UnableToLoadProxyException extends UnableToProxyException
{
Modified: incubator/aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxySubclassGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxySubclassGeneratorTest.java?rev=1030761&r1=1027885&r2=1030761&view=diff
==============================================================================
--- incubator/aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxySubclassGeneratorTest.java (original)
+++ incubator/aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxySubclassGeneratorTest.java Wed Nov 3 23:48:47 2010
@@ -29,6 +29,9 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
+import org.apache.aries.proxy.FinalModifierException;
+import org.apache.aries.proxy.impl.gen.ProxySubclassGenerator;
+import org.apache.aries.proxy.impl.gen.ProxySubclassMethodHashSet;
import org.junit.Before;
import org.junit.Test;
@@ -66,7 +69,7 @@ public class ProxySubclassGeneratorTest
* either
*
* Test method for
- * {@link org.apache.aries.blueprint.proxy.ProxySubclassGenerator#generateAndLoadSubclass()}
+ * {@link org.apache.aries.proxy.impl.ProxySubclassGenerator#generateAndLoadSubclass()}
* .
*/
@Test
@@ -312,44 +315,44 @@ public class ProxySubclassGeneratorTest
}
- /**
- * Test object equality between real and proxy using a Collaborator
- */
- @Test
- public void testObjectEquality() throws Exception
- {
- Object delegate = TEST_CLASS.newInstance();
- InvocationHandler collaborator = new Collaborator(null, null, AsmInterceptorWrapper.passThrough(delegate));
- Object o = ProxySubclassGenerator.newProxySubclassInstance(TEST_CLASS, collaborator);
- //Calling equals on the proxy with an arg of the unwrapped object should be true
- assertTrue("The proxy object should be equal to its delegate",o.equals(delegate));
- InvocationHandler collaborator2 = new Collaborator(null, null, AsmInterceptorWrapper.passThrough(delegate));
- Object o2 = ProxySubclassGenerator.newProxySubclassInstance(TEST_CLASS, collaborator2);
- //The proxy of a delegate should equal another proxy of the same delegate
- assertTrue("The proxy object should be equal to another proxy instance of the same delegate", o2.equals(o));
- }
-
- private static class ProxyTestOverridesFinalize {
- public boolean finalizeCalled = false;
-
- @Override
- protected void finalize() {
- finalizeCalled = true;
- }
- }
-
- @Test
- public void testFinalizeNotCalled() throws Exception {
- ProxyTestOverridesFinalize testObj = new ProxyTestOverridesFinalize();
- InvocationHandler ih = new Collaborator(null, null, AsmInterceptorWrapper.passThrough(testObj));
- Object o = ProxySubclassGenerator.newProxySubclassInstance(ProxyTestOverridesFinalize.class, ih);
-
- Method m = o.getClass().getDeclaredMethod("finalize");
- m.setAccessible(true);
- m.invoke(o);
-
- assertFalse(testObj.finalizeCalled);
- }
+// /**
+// * Test object equality between real and proxy using a Collaborator
+// */
+// @Test
+// public void testObjectEquality() throws Exception
+// {
+// Object delegate = TEST_CLASS.newInstance();
+// InvocationHandler collaborator = new Collaborator(null, null, AsmInterceptorWrapper.passThrough(delegate));
+// Object o = ProxySubclassGenerator.newProxySubclassInstance(TEST_CLASS, collaborator);
+// //Calling equals on the proxy with an arg of the unwrapped object should be true
+// assertTrue("The proxy object should be equal to its delegate",o.equals(delegate));
+// InvocationHandler collaborator2 = new Collaborator(null, null, AsmInterceptorWrapper.passThrough(delegate));
+// Object o2 = ProxySubclassGenerator.newProxySubclassInstance(TEST_CLASS, collaborator2);
+// //The proxy of a delegate should equal another proxy of the same delegate
+// assertTrue("The proxy object should be equal to another proxy instance of the same delegate", o2.equals(o));
+// }
+//
+// private static class ProxyTestOverridesFinalize {
+// public boolean finalizeCalled = false;
+//
+// @Override
+// protected void finalize() {
+// finalizeCalled = true;
+// }
+// }
+//
+// @Test
+// public void testFinalizeNotCalled() throws Exception {
+// ProxyTestOverridesFinalize testObj = new ProxyTestOverridesFinalize();
+// InvocationHandler ih = new Collaborator(null, null, AsmInterceptorWrapper.passThrough(testObj));
+// Object o = ProxySubclassGenerator.newProxySubclassInstance(ProxyTestOverridesFinalize.class, ih);
+//
+// Method m = o.getClass().getDeclaredMethod("finalize");
+// m.setAccessible(true);
+// m.invoke(o);
+//
+// assertFalse(testObj.finalizeCalled);
+// }
private Class<?> getGeneratedSubclass() throws Exception