You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/08/03 10:29:26 UTC

svn commit: r981775 - in /geronimo/server/trunk/testsuite/javaee6-testsuite: ./ managedbean1.0-test/ managedbean1.0-test/src/ managedbean1.0-test/src/main/ managedbean1.0-test/src/main/java/ managedbean1.0-test/src/main/java/org/ managedbean1.0-test/sr...

Author: xiaming
Date: Tue Aug  3 08:29:25 2010
New Revision: 981775

URL: http://svn.apache.org/viewvc?rev=981775&view=rev
Log:
GERONIMO-5498 simple test case for managed bean feature of java ee 6 provided by janel Zhang

Added:
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml   (with props)
Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml Tue Aug  3 08:29:25 2010
@@ -0,0 +1,107 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>javaee6-testsuite</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>managedbean1.0-test</artifactId>
+    <name>Geronimo TestSuite :: Java EE 6 Testsuite :: managedbean1.0-test</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+          <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>         
+    </dependencies> 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                   <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-failsafe-plugin</artifactId>
+		        <configuration>
+		           <suiteXmlFiles>
+			        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+		          </suiteXmlFiles>
+                        <systemPropertyVariables>
+                             <appContext>${project.artifactId}</appContext>
+                        </systemPropertyVariables>
+		        </configuration>
+		   </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java Tue Aug  3 08:29:25 2010
@@ -0,0 +1,39 @@
+/**
+ *  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.geronimo.sample.managedbean;
+
+import javax.annotation.ManagedBean;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+@ManagedBean(value="mybean")
+public class MyManagedBean {
+   @PostConstruct
+   public void setResources(){
+	   System.out.println("Setting resources");
+   }
+   @PreDestroy
+   public void cleanResources(){
+	   System.out.println("Collecting resources");
+   }
+   public String saySomeThing(String word){
+	   return word;
+   }
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/managedbean/MyManagedBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java Tue Aug  3 08:29:25 2010
@@ -0,0 +1,74 @@
+/**
+ *  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.geronimo.sample.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.sample.managedbean.MyManagedBean;
+
+/**
+ * Servlet implementation class ManagedBeanServlet
+ */
+public class ManagedBeanJNDIServlet extends HttpServlet {
+	private static final long serialVersionUID = 1L;
+       
+    /**
+     * @see HttpServlet#HttpServlet()
+     */
+    public ManagedBeanJNDIServlet() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+	/**
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+	 */
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		doPost(request,response);
+	}
+
+	/**
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+	 */
+	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		   MyManagedBean myManagedBean=null;
+		   try {
+				InitialContext ctx=new InitialContext();
+				myManagedBean=(MyManagedBean) ctx.lookup("java:module/mybean");
+			} catch (NamingException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+	        
+		    PrintWriter out = response.getWriter();
+	        out.println("<html><head><title>Common Annotation ManagedBean</title></head></html>");
+	        out.println("<body>");
+            out.println(myManagedBean.saySomeThing("Hello,I am a ManagedBean!"));
+            out.println("</body></html>");
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanJNDIServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java Tue Aug  3 08:29:25 2010
@@ -0,0 +1,70 @@
+/**
+ *  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.geronimo.sample.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.annotation.Resource;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.sample.managedbean.MyManagedBean;
+
+/**
+ * Servlet implementation class ManagedBeanServlet
+ */
+public class ManagedBeanResourceServlet extends HttpServlet {
+	 @Resource
+	 MyManagedBean myManagedBean1;
+	private static final long serialVersionUID = 1L;
+       
+    /**
+     * @see HttpServlet#HttpServlet()
+     */
+    public ManagedBeanResourceServlet() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+	/**
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+	 */
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		doPost(request,response);
+	}
+
+	/**
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+	 */
+	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		    PrintWriter out = response.getWriter();
+	        out.println("<html><head><title>Common Annotation ManagedBean</title></head></html>");
+	        out.println("<body>");
+            out.println(myManagedBean1.saySomeThing("Hello,I am a ManagedBean!"));
+            out.println("</body></html>");
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/java/org/apache/geronimo/sample/servlet/ManagedBeanResourceServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml Tue Aug  3 08:29:25 2010
@@ -0,0 +1,39 @@
+<?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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>war</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/${pom.artifactId}</context-root>
+
+</web-app>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml Tue Aug  3 08:29:25 2010
@@ -0,0 +1,47 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+	<servlet>
+		<display-name>ManagedBeanResourceServlet</display-name>
+		<servlet-name>ManagedBeanResourceServlet</servlet-name>
+		<servlet-class>org.apache.geronimo.sample.servlet.ManagedBeanResourceServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>ManagedBeanResourceServlet</servlet-name>
+		<url-pattern>/ManagedBeanResourceServlet</url-pattern>
+	</servlet-mapping>
+	
+	<servlet>
+		<display-name>ManagedBeanJNDIServlet</display-name>
+		<servlet-name>ManagedBeanJNDIServlet</servlet-name>
+		<servlet-class>org.apache.geronimo.sample.servlet.ManagedBeanJNDIServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>ManagedBeanJNDIServlet</servlet-name>
+		<url-pattern>/ManagedBeanJNDIServlet</url-pattern>
+	</servlet-mapping>
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+		<welcome-file>index.jsp</welcome-file>
+	</welcome-file-list>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html Tue Aug  3 08:29:25 2010
@@ -0,0 +1,32 @@
+<!-- /**
+ *  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 HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>Common Annotation ManagedBean</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=MacRoman">
+    </head>
+
+    <body>
+        <h1>Common Annotation ManagedBean</h1>
+        <p><a href="ManagedBeanResourceServlet">ManagedBeanResource</a></p>
+         <p><a href="ManagedBeanJNDIServlet">ManagedBeanJNDI</a></p>
+    </body>
+</html>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java Tue Aug  3 08:29:25 2010
@@ -0,0 +1,45 @@
+/**
+ *  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.geronimo.sample.managedbean.test;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+
+public class ManagedbeanTest extends SeleniumTestSupport {
+
+
+	@Test
+	public void testManagedBeanResource() {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.click("link=ManagedBeanResource");
+		selenium.waitForPageToLoad("30000");
+		Assert.assertEquals(selenium.getBodyText(),"Hello,I am a ManagedBean!");
+	}
+	@Test
+	public void testManagedBeanJNDI() {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.click("link=ManagedBeanJNDI");
+		selenium.waitForPageToLoad("30000");
+		Assert.assertEquals(selenium.getBodyText(),"Hello,I am a ManagedBean!");
+	}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/java/org/apache/geronimo/sample/managedbean/test/ManagedbeanTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml?rev=981775&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml Tue Aug  3 08:29:25 2010
@@ -0,0 +1,32 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="sample-testsuite-managedbean">
+        <packages>
+            <package name="org.apache.geronimo.sample.managedbean.test"/>
+        </packages>
+    </test>
+</suite>
+

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/managedbean1.0-test/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml?rev=981775&r1=981774&r2=981775&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml Tue Aug  3 08:29:25 2010
@@ -58,6 +58,7 @@
         <module>ejb3.1lite-test</module>
         <module>el2.2-test</module>
         <module>jsp2.2-test</module>
+        <module>managedbean1.0-test</module>
     </modules>
 
 </project>