svn commit: r1427494 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/proxy/ test/java/org/apache/webbeans/newtests/interceptors/factory/

[st...@apache.org]

Author: struberg
Date: Tue Jan  1 17:43:40 2013
New Revision: 1427494

URL: http://svn.apache.org/viewvc?rev=1427494&view=rev
Log:
OWB-344 distinct name for the intercetor proxy marker interface

+ clean up test

Added:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbInterceptorProxy.java
      - copied, changed from r1427451, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbProxy.java
Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbProxy.java
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java?rev=1427494&r1=1427493&r2=1427494&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java Tue Jan  1 17:43:40 2013
@@ -125,7 +125,7 @@ public class InterceptorDecoratorProxyFa
         ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
         String classFileName = classToProxy.getName().replace('.', '/');
 
-        String[] interfaceNames = new String[]{Type.getInternalName(OwbProxy.class)};
+        String[] interfaceNames = new String[]{Type.getInternalName(OwbInterceptorProxy.class)};
 
         cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER + Opcodes.ACC_SYNTHETIC, proxyClassFileName, null, classFileName, interfaceNames);
         cw.visitSource(classFileName + ".java", null);

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbInterceptorProxy.java (from r1427451, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbProxy.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbInterceptorProxy.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbInterceptorProxy.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbProxy.java&r1=1427451&r2=1427494&rev=1427494&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbProxy.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbInterceptorProxy.java Tue Jan  1 17:43:40 2013
@@ -19,8 +19,8 @@
 package org.apache.webbeans.proxy;
 
 /**
- * Marker Interface for all OpenWebBeans Proxies.
+ * Marker Interface for all OpenWebBeans Interceptor+Decorator Proxies.
  */
-public interface OwbProxy
+public interface OwbInterceptorProxy
 {
 }

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java?rev=1427494&r1=1427493&r2=1427494&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/InterceptorDecoratorProxyFactoryTest.java Tue Jan  1 17:43:40 2013
@@ -30,7 +30,7 @@ import org.apache.webbeans.newtests.Abst
 import org.apache.webbeans.newtests.interceptors.factory.beans.ClassInterceptedClass;
 import org.apache.webbeans.proxy.InterceptorDecoratorProxyFactory;
 
-import org.apache.webbeans.proxy.OwbProxy;
+import org.apache.webbeans.proxy.OwbInterceptorProxy;
 import org.apache.webbeans.util.ClassUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -45,11 +45,6 @@ public class InterceptorDecoratorProxyFa
     @Test
     public void textSimpleProxyCreation() throws Exception
     {
-/*X not needed so far
-        Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
-        startContainer(beanClasses, null);
-*/
-
         InterceptorDecoratorProxyFactory pf = new InterceptorDecoratorProxyFactory();
 
         // we take a fresh URLClassLoader to not blur the test classpath with synthetic classes.
@@ -80,7 +75,7 @@ public class InterceptorDecoratorProxyFa
         Boolean isDefaultCtInvoked = (Boolean) field.get(proxy);
         Assert.assertTrue(isDefaultCtInvoked);
 
-        Assert.assertTrue(proxy instanceof OwbProxy);
+        Assert.assertTrue(proxy instanceof OwbInterceptorProxy);
 
         proxy.setMeaningOfLife(42);
 
@@ -89,7 +84,7 @@ public class InterceptorDecoratorProxyFa
         Assert.assertEquals('c', proxy.getChar());
         Assert.assertEquals(internalInstance, proxy.getSelf());
 
-        //X shutDownContainer();
+        Assert.assertEquals(5, testInvocationHandler.invokedMethodNames.size());
     }
 
     public static class TestInvocationHandler implements InvocationHandler