struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgie...@apache.org
Subject svn commit: r888088 - in /struts/sandbox/trunk/struts2-cdi-example: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/struts2/ src/main/java/org/apache/struts2/example/ src/main/java/org/apache/strut...
Date Mon, 07 Dec 2009 19:09:30 GMT
Author: rgielen
Date: Mon Dec  7 19:09:27 2009
New Revision: 888088

URL: http://svn.apache.org/viewvc?rev=888088&view=rev
Log:
Struts2 CDI/JSR299 plugin example

Added:
    struts/sandbox/trunk/struts2-cdi-example/pom.xml
    struts/sandbox/trunk/struts2-cdi-example/src/
    struts/sandbox/trunk/struts2-cdi-example/src/main/
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Game.java
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Generator.java
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/MaxNumber.java
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/NumberGuess.java
    struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Random.java
    struts/sandbox/trunk/struts2-cdi-example/src/main/resources/
    struts/sandbox/trunk/struts2-cdi-example/src/main/resources/LICENSE.txt
    struts/sandbox/trunk/struts2-cdi-example/src/main/resources/NOTICE.txt
    struts/sandbox/trunk/struts2-cdi-example/src/main/resources/log4j.properties
    struts/sandbox/trunk/struts2-cdi-example/src/main/resources/struts.xml
    struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/
    struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/
    struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/beans.xml
    struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/pages/
    struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/pages/NumberGuess.jsp
    struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/web.xml
    struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/index.html
    struts/sandbox/trunk/struts2-cdi-example/src/test/

Added: struts/sandbox/trunk/struts2-cdi-example/pom.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/pom.xml?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/pom.xml (added)
+++ struts/sandbox/trunk/struts2-cdi-example/pom.xml Mon Dec  7 19:09:27 2009
@@ -0,0 +1,111 @@
+<?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-apps</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-cdi-example</artifactId>
+    <packaging>war</packaging>
+    <name>Struts2 CDI Example</name>
+
+    <repositories>
+        <repository>
+            <id>java.net</id>
+            <name>java.net Repository</name>
+            <url>http://download.java.net/maven/2</url>
+        </repository>
+        <repository>
+            <id>repository.jboss.org</id>
+            <name>JBoss Release Repository</name>
+            <url>http://repository.jboss.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-junit-plugin</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-cdi-plugin</artifactId>
+            <version>2.2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <defaultGoal>package</defaultGoal>
+        <finalName>struts2-cdi-example</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.21</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Game.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Game.java?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Game.java
(added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Game.java
Mon Dec  7 19:09:27 2009
@@ -0,0 +1,102 @@
+/*
+ * $Id: StrutsSpringObjectFactory.java 817418 2009-09-21 21:36:17Z musachy $
+ *
+ * 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.example.cdi;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.Serializable;
+
+@Named
+@SessionScoped
+public class Game implements Serializable {
+
+    public static final String CORRECT = "Correct !!!";
+    public static final String WRONG = "Sorry, wrong number !!!";
+
+    private int number;
+    private int guess;
+    private int smallest;
+
+    @MaxNumber
+    @Inject
+    private int maxNumber;
+
+    private int biggest;
+    private int remainingGuesses;
+
+    @Random
+    @Inject
+    Instance<Integer> randomNumber;
+
+    public Game() {
+    }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public int getGuess() {
+        return guess;
+    }
+
+    public void setGuess( int guess ) {
+        this.guess = guess;
+    }
+
+    public int getSmallest() {
+        return smallest;
+    }
+
+    public int getBiggest() {
+        return biggest;
+    }
+
+    public int getRemainingGuesses() {
+        return remainingGuesses;
+    }
+
+    public String check() throws InterruptedException {
+        if (guess > number) {
+            biggest = guess - 1;
+        }
+        if (guess < number) {
+            smallest = guess + 1;
+        }
+        if (guess == number) {
+            return CORRECT;
+        }
+        remainingGuesses--;
+        return WRONG;
+    }
+
+    @PostConstruct
+    public void reset() {
+        this.smallest = 0;
+        this.guess = 0;
+        this.remainingGuesses = 10;
+        this.biggest = maxNumber;
+        this.number = randomNumber.get();
+    }
+
+}

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Generator.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Generator.java?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Generator.java
(added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Generator.java
Mon Dec  7 19:09:27 2009
@@ -0,0 +1,46 @@
+/*
+ * $Id: StrutsSpringObjectFactory.java 817418 2009-09-21 21:36:17Z musachy $
+ *
+ * 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.example.cdi;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import java.io.Serializable;
+
+@ApplicationScoped
+public class Generator implements Serializable {
+   
+   private java.util.Random random = new java.util.Random( System.currentTimeMillis() );
+   
+   private int maxNumber = 100;
+   
+   java.util.Random getRandom() {
+      return random;
+   }
+   
+   @Produces @Random int next() { 
+      return getRandom().nextInt(maxNumber); 
+   }
+   
+   @Produces @MaxNumber int getMaxNumber() {
+      return maxNumber;
+   }
+
+} 

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/MaxNumber.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/MaxNumber.java?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/MaxNumber.java
(added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/MaxNumber.java
Mon Dec  7 19:09:27 2009
@@ -0,0 +1,34 @@
+/*
+ * $Id: StrutsSpringObjectFactory.java 817418 2009-09-21 21:36:17Z musachy $
+ *
+ * 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.example.cdi;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.*;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface MaxNumber {}

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/NumberGuess.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/NumberGuess.java?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/NumberGuess.java
(added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/NumberGuess.java
Mon Dec  7 19:09:27 2009
@@ -0,0 +1,57 @@
+/*
+ * $Id: StrutsSpringObjectFactory.java 817418 2009-09-21 21:36:17Z musachy $
+ *
+ * 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.example.cdi;
+
+import com.opensymphony.xwork2.ActionSupport;
+import javax.inject.Inject;
+
+public class NumberGuess extends ActionSupport {
+
+    @Inject
+    Game game;
+
+    public Game getGame() {
+        return game;
+    }
+
+    @Override
+    public String execute() throws Exception {
+        return super.execute();
+    }
+
+    public String guess() throws Exception {
+        final String errorMessage = game.check();
+        addActionError(errorMessage);
+
+        if (Game.CORRECT.equals(errorMessage)) {
+            game.reset();
+        } else if (game.getRemainingGuesses() == 0) {
+            addActionError("The correct guess was " + game.getGuess() + ". Game is reset.");
+            game.reset();
+        }
+
+
+        return SUCCESS;
+    }
+
+
+}

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Random.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Random.java?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Random.java
(added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/java/org/apache/struts2/example/cdi/Random.java
Mon Dec  7 19:09:27 2009
@@ -0,0 +1,34 @@
+/*
+ * $Id: StrutsSpringObjectFactory.java 817418 2009-09-21 21:36:17Z musachy $
+ *
+ * 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.example.cdi;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.*;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface Random {}

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/resources/LICENSE.txt?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/resources/LICENSE.txt (added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/resources/LICENSE.txt Mon Dec  7 19:09:27
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-example/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/resources/NOTICE.txt?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/resources/NOTICE.txt (added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/resources/NOTICE.txt Mon Dec  7 19:09:27
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-example/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/resources/log4j.properties?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/resources/log4j.properties (added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/resources/log4j.properties Mon Dec 
7 19:09:27 2009
@@ -0,0 +1,13 @@
+# 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
+
+

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/resources/struts.xml?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/resources/struts.xml (added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/resources/struts.xml Mon Dec  7 19:09:27
2009
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"       
+          "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+  <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
+  <constant name="struts.devMode" value="true"/>
+  
+    <package name="numberguess" extends="struts-default">
+
+        <action name="NumberGuess" class="org.apache.struts2.example.cdi.NumberGuess">
+            <result>/WEB-INF/pages/NumberGuess.jsp</result>
+        </action>
+
+        <action name="guess" class="org.apache.struts2.example.cdi.NumberGuess" method="guess">
+            <result>/WEB-INF/pages/NumberGuess.jsp</result>
+        </action>
+
+    </package>
+
+</struts>

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/beans.xml?rev=888088&view=auto
==============================================================================
    (empty)

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/pages/NumberGuess.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/pages/NumberGuess.jsp?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/pages/NumberGuess.jsp
(added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/pages/NumberGuess.jsp
Mon Dec  7 19:09:27 2009
@@ -0,0 +1,22 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title>Numberguess</title>
+</head>
+
+<body>
+<h2>Numberguess Game - Struts 2 CDI Example</h2>
+
+<h3>I've picked a number between <s:property value="game.smallest"/> and <s:property
value="game.biggest"/>.
+    You have <s:property value="game.remainingGuesses"/>remaining guesses.</h3>
+
+<s:form action="guess">
+    <s:textfield name="game.guess" label="Your Guess"/>
+    <s:submit/>
+</s:form>
+<p/>
+<s:actionerror/>
+
+</body>
+</html>

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/web.xml?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/web.xml (added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/WEB-INF/web.xml Mon Dec  7 19:09:27
2009
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="struts_blank" version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    <display-name>Struts2 CDI Example</display-name>
+
+    <filter>
+        <filter-name>struts2</filter-name>
+        <filter-class>
+            org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
+        </filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>struts2</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    
+</web-app>

Added: struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/index.html?rev=888088&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/index.html (added)
+++ struts/sandbox/trunk/struts2-cdi-example/src/main/webapp/index.html Mon Dec  7 19:09:27
2009
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+    <META HTTP-EQUIV="Refresh" CONTENT="0;URL=NumberGuess.action">
+</head>
+
+<body>
+<p>Loading ...</p>
+</body>
+</html>



Mime
View raw message