svn commit: r918611 - in /struts/sandbox/trunk/struts2-cdi-plugin: pom.xml src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java src/test/java/org/apache/struts2/cdi/FooConsumer.java src/test
Author: rgielen
Date: Wed Mar 3 18:16:43 2010
New Revision: 918611
URL: http://svn.apache.org/viewvc?rev=918611&view=rev
Log:
- adjusted dependencies to Weld 1.0.1 Final
- removed bootstrap build for Weld-SE pre final
- fixed failing tests
- minor tests enhancements
Modified:
struts/sandbox/trunk/struts2-cdi-plugin/pom.xml
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java
Modified: struts/sandbox/trunk/struts2-cdi-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/pom.xml?rev=918611&r1=918610&r2=918611&view=diff
==
--- struts/sandbox/trunk/struts2-cdi-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-cdi-plugin/pom.xml Wed Mar 3 18:16:43 2010
@@ -10,10 +10,22 @@
struts2-cdi-plugin
+
-java.net
-java.net Repository
-http://download.java.net/maven/2
+jboss.oss.repositories
+JBoss Repositories group at Sontatype OSS Nexus
+http://oss.sonatype.org/content/groups/jboss/
+
+
+
+jboss
+http://repository.jboss.com/maven2
+
+true
+
+
+false
+
@@ -22,21 +34,29 @@
javax.enterprise
cdi-api
-1.0
+1.0-SP1
provided
org.jboss.weld
weld-core
-1.0.0
+1.0.1-Final
provided
+
org.jboss.weld
weld-se
-1.0.0-SNAPSHOT
+1.0.1-Final
test
@@ -63,33 +83,4 @@
-
-
-bootstrap
-
-
-
-org.apache.maven.plugins
-maven-scm-plugin
-1.0
-
-
-resolve-weld-se
-initialize
-
-bootstrap
-
-
-install
-
scm:svn:http://anonsvn.jboss.org/repos/weld/java-se/trunk
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Modified:
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java?rev=918611&r1=918610&r2=918611&view=diff
==
---
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
(original)
+++
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
Wed Mar 3 18:16:43 2010
@@ -2,6 +2,8 @@
import org.jboss.weld.environment.se.StartMain;
import static org.junit.Assert.*;
+
+import org.jboss.weld.environment.se.WeldContainer;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.jndi.SimpleNamingContextBuilder;
@@ -10,8 +12,6 @@
/**
* CdiObjectFactoryTest.
- *
- * @author Rene Gielen
*/
public class CdiObjectFactoryTest {
@@ -21,7 +21,8 @@
builder.activate();
StartMain sm = new StartMain(new String[0]);
-builder.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP, sm.go());
+WeldContainer weldContainer = sm.go();
+builder.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP,
weldContainer.getBeanManager());
}
@Test
@@ -34,6 +35,7 @@
final CdiObjectFactory cdiObjectFactory = new CdiObjectFactory();
FooConsumer fooConsumer = (FooConsumer)
cdiObjectFactory.buildBean(FooConsumer.class.getCanonicalName(), null, false);
assertNotNull(fooConsumer);
+assertNotNull(fooConsumer.fooService);
}
@Test public void testGetInjectionTarget() throws Exception {
Modified:
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java?rev=918611&r1=918610&r2=918611&view=diff
===
svn commit: r918612 - /struts/sandbox/trunk/struts2-cdi-plugin/pom.xml
Author: rgielen Date: Wed Mar 3 18:18:48 2010 New Revision: 918612 URL: http://svn.apache.org/viewvc?rev=918612&view=rev Log: debug comment removed Modified: struts/sandbox/trunk/struts2-cdi-plugin/pom.xml Modified: struts/sandbox/trunk/struts2-cdi-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/pom.xml?rev=918612&r1=918611&r2=918612&view=diff == --- struts/sandbox/trunk/struts2-cdi-plugin/pom.xml (original) +++ struts/sandbox/trunk/struts2-cdi-plugin/pom.xml Wed Mar 3 18:18:48 2010 @@ -43,14 +43,6 @@ weld-core 1.0.1-Final provided -
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Aries (http://cwiki.apache.org/confluence/display/ARIES) Pages - AriesTrader edited by jbohn (07:00 PM) http://cwiki.apache.org/confluence/display/ARIES/AriesTrader Apache Camel (http://cwiki.apache.org/confluence/display/CAMEL) Pages - HawtDB edited by davsclaus (10:09 AM) http://cwiki.apache.org/confluence/display/CAMEL/HawtDB Aggregator2 edited by davsclaus (08:39 AM) http://cwiki.apache.org/confluence/display/CAMEL/Aggregator2 Jetty edited by davsclaus (06:48 AM) http://cwiki.apache.org/confluence/display/CAMEL/Jetty Apache Click (http://cwiki.apache.org/confluence/display/CLICK) Comments http://cwiki.apache.org/confluence/display/CLICK/Missing+Translations (1) Apache Chemistry (http://cwiki.apache.org/confluence/display/CMIS) Pages - OpenCMIS Browser edited by fmui (01:49 PM) http://cwiki.apache.org/confluence/display/CMIS/OpenCMIS+Browser Apache Directory Community & Resources (http://cwiki.apache.org/confluence/display/directory) Pages - The team edited by elecharny (07:27 PM) http://cwiki.apache.org/confluence/display/directory/The+team Apache Geronimo Project Management (http://cwiki.apache.org/confluence/display/GMOxPMGT) Pages - Geronimo 2.1.5 Release Status edited by genspr...@gmail.com (07:02 AM) http://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+2.1.5+Release+Status Geronimo Eclipse Plugin Release Process edited by dait...@gmail.com (02:08 AM) http://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+Eclipse+Plugin+Release+Process OFBiz (Open For Business) Project Open Wiki (http://cwiki.apache.org/confluence/display/OFBIZ) Comments http://cwiki.apache.org/confluence/display/OFBIZ/Addressing+Custom+Requirements+In+OFBiz (1) OpenJPA (http://cwiki.apache.org/confluence/display/openjpa) Pages - Begin using OpenJPA - The Basics edited by sco...@us.ibm.com (08:14 PM) http://cwiki.apache.org/confluence/display/openjpa/Begin+using+OpenJPA+-+The+Basics Traffic Server (http://cwiki.apache.org/confluence/display/TS) Pages - Supported OSes edited by bcall (09:23 PM) http://cwiki.apache.org/confluence/display/TS/Supported+OSes Development Process edited by bcall (09:17 PM) http://cwiki.apache.org/confluence/display/TS/Development+Process Apache Wookie (http://cwiki.apache.org/confluence/display/WOOKIE) Pages - Embedding Wookie Widgets in other Applications edited by rgardler (05:57 PM) http://cwiki.apache.org/confluence/display/WOOKIE/Embedding+Wookie+Widgets+in+other+Applications Change your notification preferences: http://cwiki.apache.org/confluence/users/viewnotifications.action
