You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/03/21 23:57:52 UTC
svn commit: r1084012 - in /myfaces/extensions/cdi/trunk: ./
examples/jsf-examples/hello_myfaces-codi_jsf20/
test-modules/cargo-test-module/ test-modules/owb10-support-module/
test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions...
Author: gpetracek
Date: Mon Mar 21 22:57:51 2011
New Revision: 1084012
URL: http://svn.apache.org/viewvc?rev=1084012&view=rev
Log:
EXTCDI-157 cleanup
Added:
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeansTestContainer.java
- copied, changed from r1083749, myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeans10TestContainer.java
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeansTestContainer.java
- copied, changed from r1083854, myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java
- copied, changed from r1082285, myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeans10TestContainer.java
Removed:
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeans10TestContainer.java
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeans10TestContainer.java
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml
myfaces/extensions/cdi/trunk/pom.xml
myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/pom.xml
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml?rev=1084012&r1=1084011&r2=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml Mon Mar 21 22:57:51 2011
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.test</groupId>
- <artifactId>myfaces-extcdi-owb10-support-module</artifactId>
+ <artifactId>myfaces-extcdi-owb-support-module</artifactId>
<scope>test</scope>
</dependency>
@@ -605,7 +605,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.test</groupId>
- <artifactId>myfaces-extcdi-owb10-support-module</artifactId>
+ <artifactId>myfaces-extcdi-owb-support-module</artifactId>
<scope>test</scope>
</dependency>
Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=1084012&r1=1084011&r2=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Mon Mar 21 22:57:51 2011
@@ -269,7 +269,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.test</groupId>
- <artifactId>myfaces-extcdi-owb10-support-module</artifactId>
+ <artifactId>myfaces-extcdi-owb-support-module</artifactId>
<version>0.9.4-SNAPSHOT</version>
</dependency>
Modified: myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/pom.xml?rev=1084012&r1=1084011&r2=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/test-modules/cargo-test-module/pom.xml Mon Mar 21 22:57:51 2011
@@ -152,7 +152,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.test</groupId>
- <artifactId>myfaces-extcdi-owb10-support-module</artifactId>
+ <artifactId>myfaces-extcdi-owb-support-module</artifactId>
<scope>test</scope>
</dependency>
Modified: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml?rev=1084012&r1=1084011&r2=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/pom.xml Mon Mar 21 22:57:51 2011
@@ -23,7 +23,7 @@
<packaging>jar</packaging>
<groupId>org.apache.myfaces.extensions.cdi.test</groupId>
- <artifactId>myfaces-extcdi-owb10-support-module</artifactId>
+ <artifactId>myfaces-extcdi-owb-support-module</artifactId>
<version>0.9.4-SNAPSHOT</version>
<name>MyFaces Extensions-CDI OpenWebBeans 1.0.0 Test-Support Module</name>
Copied: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeansTestContainer.java (from r1083749, myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeans10TestContainer.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeansTestContainer.java?p2=myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeansTestContainer.java&p1=myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeans10TestContainer.java&r1=1083749&r2=1084012&rev=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeans10TestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/AbstractOpenWebBeansTestContainer.java Mon Mar 21 22:57:51 2011
@@ -30,7 +30,7 @@ import javax.enterprise.inject.spi.Injec
/**
* @author Gerhard Petracek
*/
-public abstract class AbstractOpenWebBeans10TestContainer implements CdiTestContainer
+public abstract class AbstractOpenWebBeansTestContainer implements CdiTestContainer
{
protected org.apache.webbeans.cditest.CdiTestContainer testContainer;
Copied: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeansTestContainer.java (from r1083854, myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeansTestContainer.java?p2=myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeansTestContainer.java&p1=myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java&r1=1083854&r2=1084012&rev=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeansTestContainer.java Mon Mar 21 22:57:51 2011
@@ -24,10 +24,10 @@ import org.apache.webbeans.cditest.CdiTe
/**
* @author Gerhard Petracek
*/
-public class ServletOpenWebBeans10TestContainer
- extends AbstractOpenWebBeans10TestContainer implements ServletContainerAwareCdiTestContainer
+public class ServletOpenWebBeansTestContainer
+ extends AbstractOpenWebBeansTestContainer implements ServletContainerAwareCdiTestContainer
{
- public ServletOpenWebBeans10TestContainer()
+ public ServletOpenWebBeansTestContainer()
{
this.testContainer = CdiTestContainerLoader.getCdiContainer();
}
Copied: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java (from r1082285, myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeans10TestContainer.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java?p2=myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java&p1=myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeans10TestContainer.java&r1=1082285&r2=1084012&rev=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeans10TestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java Mon Mar 21 22:57:51 2011
@@ -23,9 +23,9 @@ import org.apache.webbeans.cditest.CdiTe
/**
* @author Gerhard Petracek
*/
-public class StandaloneOpenWebBeans10TestContainer extends AbstractOpenWebBeans10TestContainer
+public class StandaloneOpenWebBeansTestContainer extends AbstractOpenWebBeansTestContainer
{
- public StandaloneOpenWebBeans10TestContainer()
+ public StandaloneOpenWebBeansTestContainer()
{
this.testContainer = CdiTestContainerLoader.getCdiContainer();
}
Modified: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer?rev=1084012&r1=1084011&r2=1084012&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/resources/META-INF/services/org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer Mon Mar 21 22:57:51 2011
@@ -1,2 +1,2 @@
-org.apache.myfaces.extensions.cdi.test.owb.StandaloneOpenWebBeans10TestContainer
-org.apache.myfaces.extensions.cdi.test.owb.ServletOpenWebBeans10TestContainer
\ No newline at end of file
+org.apache.myfaces.extensions.cdi.test.owb.StandaloneOpenWebBeansTestContainer
+org.apache.myfaces.extensions.cdi.test.owb.ServletOpenWebBeansTestContainer
\ No newline at end of file