Author: rgielen
Date: Mon Dec 7 16:32:40 2009
New Revision: 887991
URL: http://svn.apache.org/viewvc?rev=887991&view=rev
Log:
Initial work on a CDI / JSR299 plugin
Added:
struts/sandbox/trunk/struts2-cdi-plugin/pom.xml
struts/sandbox/trunk/struts2-cdi-plugin/src/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/struts2/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/struts2/cdi/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/
struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/LICENSE.txt
struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/NOTICE.txt
struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/struts-plugin.xml
struts/sandbox/trunk/struts2-cdi-plugin/src/test/
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/
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
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/META-INF/
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/META-INF/beans.xml
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/log4j.properties
Added: struts/sandbox/trunk/struts2-cdi-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/pom.xml?rev=887991&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-plugin/pom.xml (added)
+++ struts/sandbox/trunk/struts2-cdi-plugin/pom.xml Mon Dec 7 16:32:40 2009
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-plugins</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>struts2-cdi-plugin</artifactId>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>2.5.6</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+
+ </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
Added:
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java?rev=887991&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
(added)
+++
struts/sandbox/trunk/struts2-cdi-plugin/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
Mon Dec 7 16:32:40 2009
@@ -0,0 +1,154 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.struts2.cdi;
+
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * CdiObjectFactory allows Struts 2 managed objects, like Actions,
Interceptors or Results, to be injected by a Contexts
+ * and Dependency Injection container (JSR299 / WebBeans).
+ */
+public class CdiObjectFactory extends ObjectFactory {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(CdiObjectFactory.class);
+
+ /**
+ * The key under which the BeanManager can be found according to CDI API
docs
+ */
+ public static final String CDI_JNDIKEY_BEANMANAGER_COMP =
"java:comp/BeanManager";
+ /**
+ * The key under which the BeanManager can be found according to JBoss
Weld docs
+ */
+ public static final String CDI_JNDIKEY_BEANMANAGER_APP =
"java:app/BeanManager";
+
+ protected BeanManager beanManager;
+ protected CreationalContext ctx;
+
+ Map<Class<?>, InjectionTarget<?>> injectionTargetCache = new
HashMap<Class<?>, InjectionTarget<?>>();
+
+ public CdiObjectFactory() {
+ super();
+ LOG.info("Initializing Struts2 CDI integration...");
+ this.beanManager = findBeanManager();
+ if (beanManager != null) {
+ this.ctx = buildNonContextualCreationalContext(beanManager);
+ LOG.info("Struts2 CDI integration initialized.");
+ } else {
+ LOG.error("Struts2 CDI integration could not be initialized.");
+ }
+ }
+
+ /**
+ * Try to find the CDI BeanManager from JNDI context. First the key
{...@link #CDI_JNDIKEY_BEANMANAGER_COMP} will be
+ * tested. If nothing is found there, the key {...@link
#CDI_JNDIKEY_BEANMANAGER_APP} will be checked.
+ *
+ * @return the BeanManager, if found. <tt>null</tt> otherwise.
+ */
+ protected BeanManager findBeanManager() {
+ BeanManager bm;
+ try {
+ Context initialContext = new InitialContext();
+ if (LOG.isInfoEnabled()) {
+ LOG.info("[findBeanManager]: Checking for BeanManager under
JNDI key " + CDI_JNDIKEY_BEANMANAGER_COMP);
+ }
+ try {
+ bm = (BeanManager)
initialContext.lookup(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP);
+ } catch ( NamingException e ) {
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("[findBeanManager]: Lookup failed.");
+ }
+ if (LOG.isInfoEnabled()) {
+ LOG.info("[findBeanManager]: Checking for BeanManager
under JNDI key " + CDI_JNDIKEY_BEANMANAGER_APP);
+ }
+ bm = (BeanManager)
initialContext.lookup(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_APP);
+ }
+ if (LOG.isInfoEnabled()) {
+ LOG.info("[findBeanManager]: BeanManager found.");
+ }
+ return bm;
+ } catch ( NamingException e ) {
+ LOG.error("Could not get BeanManager from JNDI context", e);
+ }
+ return null;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Object buildBean( String className, Map<String, Object>
extraContext, boolean injectInternal )
+ throws Exception {
+
+ Class<?> clazz = getClassInstance(className);
+ InjectionTarget injectionTarget = getInjectionTarget(clazz);
+
+ Object o = injectionTarget.produce(ctx);
+ injectionTarget.inject(o, ctx);
+ injectionTarget.postConstruct(o);
+
+ if (injectInternal) {
+ injectInternalBeans(o);
+ }
+
+ return o;
+ }
+
+ /**
+ * Get a InjectionTarget instance for a given class. If the appropriate
target is not found in cache, a nw instance
+ * will be created.
+ *
+ * @param clazz The class to get a InjectionTarget instance for.
+ *
+ * @return if found in cache, an existing instance. A new instance
otherwise.
+ */
+ protected InjectionTarget<?> getInjectionTarget( Class<?> clazz ) {
+ InjectionTarget<?> result;
+ synchronized ( this ) {
+ result = injectionTargetCache.get(clazz);
+ if (result == null) {
+ result =
beanManager.createInjectionTarget(beanManager.createAnnotatedType(clazz));
+ injectionTargetCache.put(clazz, result);
+ }
+
+ }
+ return result;
+ }
+
+ /**
+ * Simple wrapper for CreationalContext creation.
+ *
+ * @param beanManager the BeanManager to use for creating the context.
+ *
+ * @return the context to use, if given BeanManager was not <tt>null</tt>.
<tt>null</tt> otherwise.
+ */
+ @SuppressWarnings("unchecked")
+ protected CreationalContext buildNonContextualCreationalContext(
BeanManager beanManager ) {
+ return beanManager != null ? beanManager.createCreationalContext(null)
: null;
+ }
+}
Added: struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/LICENSE.txt?rev=887991&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/LICENSE.txt
(added)
+++ struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/LICENSE.txt Mon
Dec 7 16:32:40 2009
@@ -0,0 +1,174 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Added: struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/NOTICE.txt?rev=887991&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/NOTICE.txt
(added)
+++ struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/NOTICE.txt Mon
Dec 7 16:32:40 2009
@@ -0,0 +1,5 @@
+Apache Struts
+Copyright 2000-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Added:
struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/struts-plugin.xml?rev=887991&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/struts-plugin.xml
(added)
+++
struts/sandbox/trunk/struts2-cdi-plugin/src/main/resources/struts-plugin.xml
Mon Dec 7 16:32:40 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.1.dtd";>
+
+<struts>
+
+ <bean type="com.opensymphony.xwork2.ObjectFactory" name="cdi"
class="org.apache.struts2.cdi.CdiObjectFactory" />
+
+ <!-- Make the CDI object factory the automatic default -->
+ <constant name="struts.objectFactory" value="cdi" />
+
+ <constant name="struts.class.reloading.reloadConfig" value="false" />
+
+</struts>
Added:
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=887991&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
(added)
+++
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
Mon Dec 7 16:32:40 2009
@@ -0,0 +1,46 @@
+package org.apache.struts2.cdi;
+
+import org.jboss.weld.environment.se.StartMain;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.mock.jndi.SimpleNamingContextBuilder;
+
+import javax.enterprise.inject.spi.InjectionTarget;
+
+/**
+ * CdiObjectFactoryTest.
+ *
+ * @author Rene Gielen
+ */
+public class CdiObjectFactoryTest {
+
+ @Before
+ public void setUp() throws Exception {
+ SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
+ builder.activate();
+
+ StartMain sm = new StartMain(new String[0]);
+ builder.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP, sm.go());
+ }
+
+ @Test
+ public void testFindBeanManager() throws Exception {
+ assertNotNull(new CdiObjectFactory().findBeanManager());
+ }
+
+ @Test
+ public void testGetBean() throws Exception {
+ final CdiObjectFactory cdiObjectFactory = new CdiObjectFactory();
+ FooConsumer fooConsumer = (FooConsumer)
cdiObjectFactory.buildBean(FooConsumer.class.getCanonicalName(), null, false);
+ assertNotNull(fooConsumer);
+ }
+
+ @Test public void testGetInjectionTarget() throws Exception {
+ final CdiObjectFactory cdiObjectFactory = new CdiObjectFactory();
+ final InjectionTarget<?> injectionTarget =
cdiObjectFactory.getInjectionTarget(FooConsumer.class);
+ assertNotNull(injectionTarget);
+
assertTrue(cdiObjectFactory.injectionTargetCache.containsKey(FooConsumer.class));
+ assertSame(cdiObjectFactory.getInjectionTarget(FooConsumer.class),
injectionTarget);
+ }
+}
Added:
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=887991&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java
(added)
+++
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooConsumer.java
Mon Dec 7 16:32:40 2009
@@ -0,0 +1,18 @@
+package org.apache.struts2.cdi;
+
+import javax.inject.Inject;
+
+/**
+ * FooConsumer.
+ *
+ * @author Rene Gielen
+ */
+public class FooConsumer {
+
+ @Inject
+ private FooService fooService;
+
+ public void foo() {
+ System.out.println(fooService.getHello());
+ }
+}
Added:
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java?rev=887991&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java
(added)
+++
struts/sandbox/trunk/struts2-cdi-plugin/src/test/java/org/apache/struts2/cdi/FooService.java
Mon Dec 7 16:32:40 2009
@@ -0,0 +1,14 @@
+package org.apache.struts2.cdi;
+
+/**
+ * FooService.
+ *
+ * @author Rene Gielen
+ */
+public class FooService {
+
+ public String getHello() {
+ return "Hello";
+ }
+
+}
Added:
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/META-INF/beans.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/META-INF/beans.xml?rev=887991&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/META-INF/beans.xml
(added)
+++
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/META-INF/beans.xml
Mon Dec 7 16:32:40 2009
@@ -0,0 +1 @@
+<beans></beans>
\ No newline at end of file
Added:
struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/log4j.properties?rev=887991&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/log4j.properties
(added)
+++ struts/sandbox/trunk/struts2-cdi-plugin/src/test/resources/log4j.properties
Mon Dec 7 16:32:40 2009
@@ -0,0 +1,11 @@
+# Set root logger level to WARN and append to stdout
+log4j.rootLogger=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
+
+# Print only messages of level ERROR or above in the package noModule.
+log4j.logger.noModule=FATAL
