- adjusted dependencies to Weld 1.0.1 Final
- removed bootstrap build for Weld-SE pre final
- fixed failing tests
- minor tests enhancements
git-svn-id: https://svn.apache.org/repos/asf/struts/sandbox/trunk@918611 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/struts2-cdi-plugin/pom.xml b/struts2-cdi-plugin/pom.xml
index ce67332..c6ebeda 100644
--- a/struts2-cdi-plugin/pom.xml
+++ b/struts2-cdi-plugin/pom.xml
@@ -10,10 +10,22 @@
<artifactId>struts2-cdi-plugin</artifactId>
<repositories>
+ <!-- The home of the Weld artifacts -->
<repository>
- <id>java.net</id>
- <name>java.net Repository</name>
- <url>http://download.java.net/maven/2</url>
+ <id>jboss.oss.repositories</id>
+ <name>JBoss Repositories group at Sontatype OSS Nexus</name>
+ <url>http://oss.sonatype.org/content/groups/jboss/</url>
+ </repository>
+ <!-- The home of jboss-interceptor -->
+ <repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.com/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
@@ -22,21 +34,29 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.0</version>
+ <version>1.0-SP1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-Final</version>
<scope>provided</scope>
+<!--
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ </exclusion>
+ </exclusions>
+-->
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-se</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-Final</version>
<scope>test</scope>
</dependency>
@@ -63,33 +83,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>bootstrap</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>resolve-weld-se</id>
- <phase>initialize</phase>
- <goals>
- <goal>bootstrap</goal>
- </goals>
- <configuration>
- <goals>install</goals>
- <connectionUrl>scm:svn:http://anonsvn.jboss.org/repos/weld/java-se/trunk
- </connectionUrl>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
\ No newline at end of file
diff --git a/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java b/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
index be93485..f35ac55 100644
--- a/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
+++ b/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
@@ -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 {
diff --git a/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java b/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java
index d4ea4aa..9f133f7 100644
--- a/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java
+++ b/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java
@@ -4,14 +4,12 @@
/**
* FooConsumer.
- *
- * @author Rene Gielen
*/
public class FooConsumer {
@Inject
- private FooService fooService;
-
+ FooService fooService;
+
public void foo() {
System.out.println(fooService.getHello());
}
diff --git a/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java b/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java
index 4113f78..afc6bf0 100644
--- a/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java
+++ b/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java
@@ -2,8 +2,6 @@
/**
* FooService.
- *
- * @author Rene Gielen
*/
public class FooService {
