openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1477318 - in /openwebbeans/trunk: webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/ webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ webbeans-impl/src/main/java/org/apache/webbeans/component/ webbeans-impl/src/ma...
Date Mon, 29 Apr 2013 20:21:36 GMT
Author: gpetracek
Date: Mon Apr 29 20:21:31 2013
New Revision: 1477318

URL: http://svn.apache.org/r1477318
Log:
OWB-850 fixed compile issues (broken since r1477205) and adjusted class names

Added:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java
      - copied, changed from r1477209, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
      - copied, changed from r1477209, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducerFactory.java
Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducerFactory.java
Modified:
    openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrincipalBean.java
    openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
    openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
    openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java

Modified: openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrincipalBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrincipalBean.java?rev=1477318&r1=1477317&r2=1477318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrincipalBean.java
(original)
+++ openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrincipalBean.java
Mon Apr 29 20:21:31 2013
@@ -24,8 +24,9 @@ import org.apache.webbeans.component.Bui
 import org.apache.webbeans.component.SimpleProducerFactory;
 import org.apache.webbeans.component.WebBeansType;
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.portable.ProviderBasedProxyProducer;
+import org.apache.webbeans.portable.ProviderBasedProducer;
 
+//used by BeansDeployer (created via reflection)
 public class PrincipalBean extends BuildInOwbBean<Principal>
 {
 
@@ -34,7 +35,7 @@ public class PrincipalBean extends Build
         super(webBeansContext,
               WebBeansType.PRINCIPAL,
               Principal.class,
-              new SimpleProducerFactory<Principal>(new ProviderBasedProxyProducer<Principal>(webBeansContext,
Principal.class, new PrincipalProvider(webBeansContext))));
+              new SimpleProducerFactory<Principal>(new ProviderBasedProducer<Principal>(webBeansContext,
Principal.class, new PrincipalProvider(webBeansContext), true)));
     }
 
     @Override

Modified: openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java?rev=1477318&r1=1477317&r2=1477318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
(original)
+++ openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
Mon Apr 29 20:21:31 2013
@@ -24,8 +24,9 @@ import org.apache.webbeans.component.Bui
 import org.apache.webbeans.component.SimpleProducerFactory;
 import org.apache.webbeans.component.WebBeansType;
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.portable.ProviderBasedProxyProducer;
+import org.apache.webbeans.portable.ProviderBasedProducer;
 
+//used by BeansDeployer (created via reflection)
 public class UserTransactionBean extends BuildInOwbBean<UserTransaction>
 {
 
@@ -35,7 +36,7 @@ public class UserTransactionBean extends
               WebBeansType.USERTRANSACTION,
               UserTransaction.class,
               new SimpleProducerFactory<UserTransaction>(
-                      new ProviderBasedProxyProducer<UserTransaction>(webBeansContext,
UserTransaction.class, new UserTransactionProvider(webBeansContext))));
+                      new ProviderBasedProducer<UserTransaction>(webBeansContext, UserTransaction.class,
new UserTransactionProvider(webBeansContext), true)));
     }
 
     @Override

Modified: openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java?rev=1477318&r1=1477317&r2=1477318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
(original)
+++ openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
Mon Apr 29 20:21:31 2013
@@ -24,8 +24,9 @@ import org.apache.webbeans.component.Bui
 import org.apache.webbeans.component.SimpleProducerFactory;
 import org.apache.webbeans.component.WebBeansType;
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.portable.ProviderBasedProxyProducer;
+import org.apache.webbeans.portable.ProviderBasedProducer;
 
+//used by BeansDeployer (created via reflection)
 public class ValidatorBean extends BuildInOwbBean<Validator>
 {
 
@@ -34,7 +35,7 @@ public class ValidatorBean extends Build
         super(webBeansContext,
               WebBeansType.VALIDATION,
               Validator.class,
-              new SimpleProducerFactory<Validator>(new ProviderBasedProxyProducer<Validator>(webBeansContext,
Validator.class, new ValidatorProvider(webBeansContext))));
+              new SimpleProducerFactory<Validator>(new ProviderBasedProducer<Validator>(webBeansContext,
Validator.class, new ValidatorProvider(webBeansContext), true)));
     }
 
     @Override

Modified: openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java?rev=1477318&r1=1477317&r2=1477318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
(original)
+++ openwebbeans/trunk/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
Mon Apr 29 20:21:31 2013
@@ -24,8 +24,9 @@ import org.apache.webbeans.component.Bui
 import org.apache.webbeans.component.SimpleProducerFactory;
 import org.apache.webbeans.component.WebBeansType;
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.portable.ProviderBasedProxyProducer;
+import org.apache.webbeans.portable.ProviderBasedProducer;
 
+//used by BeansDeployer (created via reflection)
 public class ValidatorFactoryBean extends BuildInOwbBean<ValidatorFactory>
 {
 
@@ -35,7 +36,7 @@ public class ValidatorFactoryBean extend
               WebBeansType.VALIDATIONFACT,
               ValidatorFactory.class,
               new SimpleProducerFactory<ValidatorFactory>(
-                      new ProviderBasedProxyProducer<ValidatorFactory>(webBeansContext,
ValidatorFactory.class, new ValidatorFactoryProvider(webBeansContext))));
+                      new ProviderBasedProducer<ValidatorFactory>(webBeansContext,
ValidatorFactory.class, new ValidatorFactoryProvider(webBeansContext), true)));
     }
     
     @Override

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=1477318&r1=1477317&r2=1477318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
Mon Apr 29 20:21:31 2013
@@ -20,7 +20,7 @@ package org.apache.webbeans.component;
 
 import java.lang.annotation.Annotation;
 
-import org.apache.webbeans.portable.ProviderBasedProxyProducerFactory;
+import org.apache.webbeans.portable.ProviderBasedProducerFactory;
 import org.apache.webbeans.spi.ResourceInjectionService;
 import org.apache.webbeans.spi.api.ResourceReference;
 
@@ -39,7 +39,7 @@ public class ResourceBean<X, T extends A
         super(ownerComponent,
               beanAttributes,
               beanClass,
-              new ProviderBasedProxyProducerFactory<X>(Dependent.class.equals(beanAttributes.getScope()),
+              new ProviderBasedProducerFactory<X>(Dependent.class.equals(beanAttributes.getScope()),
                       new ResourceProvider<X>(resourceReference, ownerComponent.getWebBeansContext()),
                                                        beanClass,
                                                        ownerComponent.getWebBeansContext()));

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java
(from r1477209, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducer.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducer.java&r1=1477209&r2=1477318&rev=1477318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java
Mon Apr 29 20:21:31 2013
@@ -25,7 +25,7 @@ import org.apache.webbeans.config.WebBea
 import org.apache.webbeans.proxy.NormalScopeProxyFactory;
 import org.apache.webbeans.util.WebBeansUtil;
 
-public class ProviderBasedProxyProducer<T> extends AbstractProducer<T>
+public class ProviderBasedProducer<T> extends AbstractProducer<T>
 {
 
     private WebBeansContext webBeansContext;
@@ -34,7 +34,7 @@ public class ProviderBasedProxyProducer<
     private T proxyInstance;
     private boolean proxy;
 
-    public ProviderBasedProxyProducer(WebBeansContext webBeansContext, Class<T> returnType,
Provider<T> provider, boolean proxy)
+    public ProviderBasedProducer(WebBeansContext webBeansContext, Class<T> returnType,
Provider<T> provider, boolean proxy)
     {
         this.webBeansContext = webBeansContext;
         this.returnType = returnType;

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
(from r1477209, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducerFactory.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducerFactory.java&r1=1477209&r2=1477318&rev=1477318&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProxyProducerFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
Mon Apr 29 20:21:31 2013
@@ -26,7 +26,7 @@ import org.apache.webbeans.component.spi
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.util.Asserts;
 
-public class ProviderBasedProxyProducerFactory<P> implements ProducerFactory<P>
+public class ProviderBasedProducerFactory<P> implements ProducerFactory<P>
 {
 
     private Provider<?> provider;
@@ -34,7 +34,7 @@ public class ProviderBasedProxyProducerF
     private WebBeansContext webBeansContext;
     private boolean proxy;
     
-    public ProviderBasedProxyProducerFactory(boolean proxy, Provider<?> provider, Class<?>
providerType, WebBeansContext context)
+    public ProviderBasedProducerFactory(boolean proxy, Provider<?> provider, Class<?>
providerType, WebBeansContext context)
     {
         Asserts.assertNotNull(provider);
         Asserts.assertNotNull(providerType);
@@ -48,6 +48,6 @@ public class ProviderBasedProxyProducerF
     @Override
     public <T> Producer<T> createProducer(Bean<T> bean)
     {
-        return new ProviderBasedProxyProducer<T>(webBeansContext, (Class<T>)providerType,
(Provider<T>)provider, proxy);
+        return new ProviderBasedProducer<T>(webBeansContext, (Class<T>)providerType,
(Provider<T>)provider, proxy);
     }
 }



Mime
View raw message