svn commit: r1467835 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy: InterceptorDecoratorProxyFactory.java NormalScopeProxyFactory.java SubclassProxyFactory.java

[struberg]

Author: struberg
Date: Sun Apr 14 22:04:45 2013
New Revision: 1467835

URL: http://svn.apache.org/r1467835
Log:
OWB-829 use $$ as separator for our proxy classes

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.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=1467835&r1=1467834&r2=1467835&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
 Sun Apr 14 22:04:45 2013
@@ -175,7 +175,7 @@ public class InterceptorDecoratorProxyFa
                                                       Method[] 
interceptedMethods, Method[] nonInterceptedMethods)
             throws ProxyGenerationException
     {
-        String proxyClassName = getUnusedProxyClassName(classLoader, 
classToProxy.getName() + "$OwbInterceptProxy");
+        String proxyClassName = getUnusedProxyClassName(classLoader, 
classToProxy.getName() + "$$OwbInterceptProxy");
 
 
         Class<T> clazz = createProxyClass(classLoader, proxyClassName, 
classToProxy, interceptedMethods, nonInterceptedMethods);

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java?rev=1467835&r1=1467834&r2=1467835&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
 Sun Apr 14 22:04:45 2013
@@ -217,7 +217,7 @@ public class NormalScopeProxyFactory ext
     public <T> Class<T> createProxyClass(ClassLoader classLoader, Class<T> 
classToProxy)
             throws ProxyGenerationException
     {
-        String proxyClassName = getUnusedProxyClassName(classLoader, 
classToProxy.getName() + "$OwbNormalScopeProxy");
+        String proxyClassName = getUnusedProxyClassName(classLoader, 
classToProxy.getName() + "$$OwbNormalScopeProxy");
 
         Method[] nonInterceptedMethods;
         Method[] interceptedMethods = null;

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java?rev=1467835&r1=1467834&r2=1467835&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
 Sun Apr 14 22:04:45 2013
@@ -86,7 +86,7 @@ public class SubclassProxyFactory extend
 
     private <T> String getSubClassName(Class<T> classToProxy)
     {
-        return fixPreservedPackages(classToProxy.getName() + "$OwbSubClass");
+        return fixPreservedPackages(classToProxy.getName() + "$$OwbSubClass");
     }
 
     /**