Author: yingwang
Date: Mon Jan 10 22:48:06 2011
New Revision: 1057408
URL: http://svn.apache.org/viewvc?rev=1057408&view=rev
Log:
[OWB-508] changes the 4 build in beans to add proxy wrapper around them.
Modified:
openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrinicipalBean.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
Modified:
openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrinicipalBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrinicipalBean.java?rev=1057408&r1=1057407&r2=1057408&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrinicipalBean.java
(original)
+++
openwebbeans/trunk/webbeans-ee-common/src/main/java/org/apache/webbeans/ee/common/beans/PrinicipalBean.java
Mon Jan 10 22:48:06 2011
@@ -24,11 +24,11 @@ import javax.enterprise.context.spi.Crea
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.component.AbstractOwbBean;
+import org.apache.webbeans.component.BuildInOwbBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.spi.SecurityService;
-public class PrinicipalBean extends AbstractOwbBean<Principal>
+public class PrinicipalBean extends BuildInOwbBean<Principal>
{
public PrinicipalBean()
@@ -46,6 +46,19 @@ public class PrinicipalBean extends Abst
SecurityService securityService =
getWebBeansContext().getService(SecurityService.class);
if(securityService != null)
{
+ Principal t = securityService.getCurrentPrincipal();
+ return createProxyWrapper(t, creationalContext);
+ }
+
+ return null;
+ }
+
+ @Override
+ protected Principal createActualInstance(CreationalContext<Principal>
creationalContext)
+ {
+ SecurityService securityService =
getWebBeansContext().getService(SecurityService.class);
+ if(securityService != null)
+ {
return securityService.getCurrentPrincipal();
}
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=1057408&r1=1057407&r2=1057408&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 Jan 10 22:48:06 2011
@@ -23,11 +23,11 @@ import javax.transaction.UserTransaction
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.component.AbstractOwbBean;
+import org.apache.webbeans.component.BuildInOwbBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.spi.TransactionService;
-public class UserTransactionBean extends AbstractOwbBean<UserTransaction>
+public class UserTransactionBean extends BuildInOwbBean<UserTransaction>
{
public UserTransactionBean()
@@ -40,7 +40,7 @@ public class UserTransactionBean extends
}
@Override
- protected UserTransaction
createInstance(CreationalContext<UserTransaction> creationalContext)
+ protected UserTransaction
createActualInstance(CreationalContext<UserTransaction> creationalContext)
{
TransactionService transactionService =
getWebBeansContext().getService(TransactionService.class);
if(transactionService != null)
@@ -52,6 +52,19 @@ public class UserTransactionBean extends
}
@Override
+ protected UserTransaction
createInstance(CreationalContext<UserTransaction> creationalContext)
+ {
+ TransactionService transactionService =
getWebBeansContext().getService(TransactionService.class);
+ if(transactionService != null)
+ {
+ UserTransaction t = transactionService.getUserTransaction();
+ return createProxyWrapper(t, creationalContext);
+ }
+
+ return null;
+ }
+
+ @Override
public boolean isPassivationCapable()
{
return true;
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=1057408&r1=1057407&r2=1057408&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 Jan 10 22:48:06 2011
@@ -23,11 +23,11 @@ import javax.validation.Validator;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.component.AbstractOwbBean;
+import org.apache.webbeans.component.BuildInOwbBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.spi.ValidatorService;
-public class ValidatorBean extends AbstractOwbBean<Validator>
+public class ValidatorBean extends BuildInOwbBean<Validator>
{
public ValidatorBean()
@@ -45,13 +45,25 @@ public class ValidatorBean extends Abstr
ValidatorService validatorService =
getWebBeansContext().getService(ValidatorService.class);
if(validatorService != null)
{
- return validatorService.getDefaultValidator();
+ Validator t = validatorService.getDefaultValidator();
+ return createProxyWrapper(t, creationalContext);
}
return null;
}
@Override
+ protected Validator createActualInstance(CreationalContext<Validator>
creationalContext)
+ {
+ ValidatorService validatorService =
getWebBeansContext().getService(ValidatorService.class);
+ if(validatorService != null)
+ {
+ return validatorService.getDefaultValidator();
+ }
+ return null;
+ }
+
+ @Override
public boolean isPassivationCapable()
{
return true;
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=1057408&r1=1057407&r2=1057408&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 Jan 10 22:48:06 2011
@@ -23,11 +23,11 @@ import javax.validation.ValidatorFactory
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.component.AbstractOwbBean;
+import org.apache.webbeans.component.BuildInOwbBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.spi.ValidatorService;
-public class ValidatorFactoryBean extends AbstractOwbBean<ValidatorFactory>
+public class ValidatorFactoryBean extends BuildInOwbBean<ValidatorFactory>
{
public ValidatorFactoryBean()
@@ -45,13 +45,25 @@ public class ValidatorFactoryBean extend
ValidatorService validatorService =
getWebBeansContext().getService(ValidatorService.class);
if(validatorService != null)
{
- return validatorService.getDefaultValidatorFactory();
+ ValidatorFactory t = validatorService.getDefaultValidatorFactory();
+ return createProxyWrapper(t, creationalContext);
}
return null;
}
@Override
+ protected ValidatorFactory
createActualInstance(CreationalContext<ValidatorFactory> creationalContext)
+ {
+ ValidatorService validatorService =
getWebBeansContext().getService(ValidatorService.class);
+ if(validatorService != null)
+ {
+ return validatorService.getDefaultValidatorFactory();
+ }
+ return null;
+ }
+
+ @Override
public boolean isPassivationCapable()
{
return true;
