You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2010/02/15 12:18:00 UTC
svn commit: r910206 - in /openwebbeans/trunk: ./
webbeans-impl/src/main/java/org/apache/webbeans/component/
webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/
webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives...
Author: struberg
Date: Mon Feb 15 11:17:59 2010
New Revision: 910206
URL: http://svn.apache.org/viewvc?rev=910206&view=rev
Log:
OWB-282 make OWB compileable again.
TODO: please review the ct changes and fix compilation errors in webbeans-porting
Modified:
openwebbeans/trunk/pom.xml
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/PrinicipalBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/UserTransactionBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorFactoryBean.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer4.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
Modified: openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Mon Feb 15 11:17:59 2010
@@ -345,7 +345,7 @@
<module>webbeans-jms</module>
<module>webbeans-jsf</module>
<module>webbeans-resource</module>
- <module>webbeans-porting</module>
+ <!-- <module>webbeans-porting</module> -->
<module>samples</module>
<!-- <module>webbeans-tck</module>-->
</modules>
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java Mon Feb 15 11:17:59 2010
@@ -111,7 +111,7 @@
*/
protected AbstractOwbBean(WebBeansType webBeanType)
{
- this(webBeanType, null);
+ this(webBeanType, null);
}
/**
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/PrinicipalBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/PrinicipalBean.java?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/PrinicipalBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/PrinicipalBean.java Mon Feb 15 11:17:59 2010
@@ -34,7 +34,7 @@
public PrinicipalBean()
{
- super(WebBeansType.USERTRANSACTION);
+ super(WebBeansType.PRINCIPAL, Principal.class);
addApiType(Object.class);
addApiType(Principal.class);
addQualifier(new DefaultLiteral());
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/UserTransactionBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/UserTransactionBean.java?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/UserTransactionBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/UserTransactionBean.java Mon Feb 15 11:17:59 2010
@@ -33,7 +33,7 @@
protected UserTransactionBean()
{
- super(WebBeansType.USERTRANSACTION);
+ super(WebBeansType.USERTRANSACTION, UserTransaction.class);
addApiType(Object.class);
addApiType(UserTransaction.class);
addQualifier(new DefaultLiteral());
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorBean.java?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorBean.java Mon Feb 15 11:17:59 2010
@@ -33,7 +33,7 @@
public ValidatorBean()
{
- super(WebBeansType.USERTRANSACTION);
+ super(WebBeansType.VALIDATION, Validator.class);
addApiType(Object.class);
addApiType(Validator.class);
addQualifier(new DefaultLiteral());
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorFactoryBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorFactoryBean.java?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorFactoryBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/javaee/ValidatorFactoryBean.java Mon Feb 15 11:17:59 2010
@@ -33,7 +33,7 @@
public ValidatorFactoryBean()
{
- super(WebBeansType.USERTRANSACTION);
+ super(WebBeansType.VALIDATIONFACT, ValidatorFactory.class);
addApiType(Object.class);
addApiType(ValidatorFactory.class);
addQualifier(new DefaultLiteral());
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer4.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer4.java?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer4.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/common/AlternativeBeanProducer4.java Mon Feb 15 11:17:59 2010
@@ -20,7 +20,6 @@
import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Disposes;
@Alternative
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java?rev=910206&r1=910205&r2=910206&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java Mon Feb 15 11:17:59 2010
@@ -15,7 +15,6 @@
import junit.framework.Assert;
-import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.AbstractInjectionTargetBean;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;