geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r981779 - in /geronimo/server/trunk/testsuite/javaee6-testsuite: ./ di1.0-test/ di1.0-test/src/ di1.0-test/src/main/ di1.0-test/src/main/java/ di1.0-test/src/main/java/org/ di1.0-test/src/main/java/org/apache/ di1.0-test/src/main/java/org/a...
Date Tue, 03 Aug 2010 08:45:27 GMT
Author: xiaming
Date: Tue Aug  3 08:45:26 2010
New Revision: 981779

URL: http://svn.apache.org/viewvc?rev=981779&view=rev
Log:
GERONIMO-5489 simple test case for JSR 330 support verification in Geronimo, provided by Wang Guang Zhe

Added:
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/beans.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.jsp   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result1.xhtml
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result2.xhtml
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/resources/
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.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/di1.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml Tue Aug  3 08:45:26 2010
@@ -0,0 +1,117 @@
+<?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.
+-->
+<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>
+    <description>Sample JSF2 Application</description>
+    <parent>
+		<groupId>org.apache.geronimo.testsuite</groupId>
+		<artifactId>javaee6-testsuite</artifactId>
+		<version>3.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>di1.0-test</artifactId>
+	<name>Geronimo TestSuite :: Java EE 6 Testsuite :: Dependency Injection for Java 1.0-test</name>
+	<packaging>war</packaging>
+
+    <dependencies>
+
+        <!-- MyFaces API -->
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <version>2.0.0</version>
+			<scope>provided</scope>
+        </dependency>
+
+
+        <!-- JSR-299 API -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+			<scope>provided</scope>
+        </dependency>
+
+        <!-- JSR-330 API -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+			<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}/car</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/di1.0-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java Tue Aug  3 08:45:26 2010
@@ -0,0 +1,42 @@
+/*
+ * 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.testsuite.di.app;
+
+import java.io.Serializable;
+
+import javax.inject.Named;
+
+@Named("apl")
+public class Apple implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String message;
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public void eat() {
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java Tue Aug  3 08:45:26 2010
@@ -0,0 +1,42 @@
+/*
+ * 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.testsuite.di.app;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+@Named
+public class AppleBean {
+	private @Inject @Big Provider<Apple> bigAppleProvider;
+	private @Inject @Little Provider<Apple> littleAppleProvider;
+	
+	public String eatBigApple() {
+		bigAppleProvider.get().eat();
+		return "result1";
+	}
+	
+	public String eatLittleApple() {
+//		Apple little = littleAppleProvider.get();
+//		System.out.print(little);
+//		little.eat();
+//		System.out.print(little.getMessage());
+		littleAppleProvider.get().eat();
+		return "result2";
+	}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java Tue Aug  3 08:45:26 2010
@@ -0,0 +1,26 @@
+/*
+ * 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.testsuite.di.app;
+import java.lang.annotation.RetentionPolicy;
+@java.lang.annotation.Documented
+@java.lang.annotation.Retention(RetentionPolicy.RUNTIME)
+@javax.inject.Qualifier
+public @interface Big {
+	
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java Tue Aug  3 08:45:26 2010
@@ -0,0 +1,48 @@
+/*
+ * 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.testsuite.di.app;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+@Big
+@Named("big")
+public class BigApple extends Apple {
+
+	private static final long serialVersionUID = 1L;
+	private int no = 1;
+
+	public void setNo(int no) {
+		this.no = no;
+	}
+
+	public int getNo() {
+		return no;
+	}
+
+	public void eat() {
+		no--;
+		if (no == 0) {
+			setMessage("Congratulations! You have got the only apple!");
+		} else {
+			setMessage("Sorry, the only apple has been taken by another guy~");
+		}
+	}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java Tue Aug  3 08:45:26 2010
@@ -0,0 +1,26 @@
+/*
+ * 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.testsuite.di.app;
+import java.lang.annotation.RetentionPolicy;
+@java.lang.annotation.Documented
+@java.lang.annotation.Retention(RetentionPolicy.RUNTIME)
+@javax.inject.Qualifier
+public @interface Little {
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java Tue Aug  3 08:45:26 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.
+ */
+package org.apache.geronimo.testsuite.di.app;
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+@Named("little")
+@SessionScoped
+@Little
+public class LittleApple extends Apple {
+	private static final long serialVersionUID = 1L;
+
+	public void eat() {
+		setMessage("Congratulations! There are enough small apples!");
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml Tue Aug  3 08:45:26 2010
@@ -0,0 +1,20 @@
+<?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.
+-->
+<beans/>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/beans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Aug  3 08:45:26 2010
@@ -0,0 +1,28 @@
+#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.
+#---------------------------------------------------------------
+# The default configuration for OpenWebBeans
+#
+# The default configuration is intended for a JDK and a simple ServletContainer
+# like jetty, resin or tomcat.
+# 
+#---------------------------------------------------------------
+
+#general configuration section
+
+org.apache.webbeans.application.useJSF2Extensions=false
+org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el10.EL10Adaptor
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/beans.xml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/beans.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/beans.xml Tue Aug  3 08:45:26 2010
@@ -0,0 +1,20 @@
+<?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.
+-->
+<beans/>
\ No newline at end of file

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

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml Tue Aug  3 08:45:26 2010
@@ -0,0 +1,68 @@
+<?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.
+-->
+
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xi="http://www.w3.org/2001/XInclude" 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-facesconfig_1_2.xsd">
+
+	<navigation-rule>
+		<from-view-id>/index.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>result1</from-outcome>
+			<to-view-id>/result1.xhtml</to-view-id>
+			<redirect />
+		</navigation-case>
+	</navigation-rule>
+
+	<navigation-rule>
+		<from-view-id>/index.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>result2</from-outcome>
+			<to-view-id>/result2.xhtml</to-view-id>
+			<redirect />
+		</navigation-case>
+	</navigation-rule>
+	
+
+	<navigation-rule>
+		<from-view-id>/result1.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>index</from-outcome>
+			<to-view-id>/index.xhtml</to-view-id>
+			<redirect />
+		</navigation-case>
+	</navigation-rule>
+
+	<navigation-rule>
+		<from-view-id>/result2.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>index</from-outcome>
+			<to-view-id>/index.xhtml</to-view-id>
+			<redirect />
+		</navigation-case>
+	</navigation-rule>
+
+
+	<application>
+		<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+	</application>
+
+
+</faces-config>

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

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/geronimo-web.xml Tue Aug  3 08:45:26 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>${project.groupId}</sys:groupId>
+      <sys:artifactId>${project.artifactId}</sys:artifactId>
+      <sys:version>${project.version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/${project.artifactId}</context-root>
+
+</web-app>

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

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml Tue Aug  3 08:45:26 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.
+-->
+<web-app 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"
+	version="2.5">
+
+	<context-param>
+		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+		<param-value>.xhtml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.apache.webbeans.servlet.WebBeansConfigurationListener
+		</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+	</listener>
+
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<servlet-mapping>
+		<servlet-name>Faces Servlet</servlet-name>
+		<url-pattern>*.jsf</url-pattern>
+	</servlet-mapping>
+
+</web-app>
\ No newline at end of file

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

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.jsp?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.jsp (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.jsp Tue Aug  3 08:45:26 2010
@@ -0,0 +1,21 @@
+<!--
+	
+	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.
+-->
+<html>
+<head>
+<meta HTTP-EQUIV="REFRESH" content="0; url=index.jsf">
+</head>
+</html>

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

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

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

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/index.xhtml Tue Aug  3 08:45:26 2010
@@ -0,0 +1,33 @@
+<!--
+	
+	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 XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets">
+	<body>
+	<h:form id="q">
+		<h:outputText value="There is only one big apple and I don't know whether it has been taken bu another guy! So good luck!" />
+		<br />
+		<h:commandButton value="I want eat this big apple!" id="q" action="#{appleBean.eatBigApple}" />
+		<br />
+		<h:outputText value="But there are many small apples! Enjoy it" />
+		<br />
+		<h:commandButton value="I want eat small apples!" id="qq" action="#{appleBean.eatLittleApple}" />
+	</h:form>
+	</body>
+</html>
\ No newline at end of file

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result1.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result1.xhtml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result1.xhtml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result1.xhtml Tue Aug  3 08:45:26 2010
@@ -0,0 +1,29 @@
+<!--
+	
+	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 XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets">
+	<body>
+		<h:outputText value="#{big.message}" />
+		<br />
+		<h:form id="q">
+			<h:commandButton id = "q" value="Go to eat another apple!" action="index" />
+		</h:form>
+	</body>
+</html>
\ No newline at end of file

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result2.xhtml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result2.xhtml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result2.xhtml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/result2.xhtml Tue Aug  3 08:45:26 2010
@@ -0,0 +1,29 @@
+<!--
+	
+	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 XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets">
+	<body>
+		<h:outputText value="#{little.message}" />
+		<br />
+		<h:form id="q">
+			<h:commandButton id = "q" value="Go to eat another apple!" action="index" />
+		</h:form>
+	</body>
+</html>
\ No newline at end of file

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java Tue Aug  3 08:45:26 2010
@@ -0,0 +1,50 @@
+/**
+ *  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.testsuite.di;
+
+import org.testng.annotations.Test;
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+
+public class TestDi extends SeleniumTestSupport {
+
+	@Test
+	public void testDi() throws Exception {
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);
+		selenium.click("q:q");
+		waitForPageLoad();
+		assertTrue(selenium
+				.isTextPresent("Congratulations! You have got the only apple!"));
+		selenium.click("q:q");
+		waitForPageLoad();
+		selenium.click("q:q");
+		waitForPageLoad();
+		assertTrue(selenium
+				.isTextPresent("Sorry, the only apple has been taken by another guy~"));
+		selenium.click("q:q");
+		waitForPageLoad();
+		selenium.click("q:qq");
+		waitForPageLoad();
+		assertTrue(selenium
+				.isTextPresent("Congratulations! There are enough small apples!"));
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/resources/testng.xml?rev=981779&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/resources/testng.xml Tue Aug  3 08:45:26 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="di1.0-test" verbose="1">
+	<test name="javaee6-testsuite-dependency-injection-for-java">
+		<packages>
+			<package name="org.apache.geronimo.testsuite.di" />
+		</packages>
+	</test>
+</suite>
+

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

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

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.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=981779&r1=981778&r2=981779&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/pom.xml Tue Aug  3 08:45:26 2010
@@ -59,6 +59,7 @@
         <module>el2.2-test</module>
         <module>jsp2.2-test</module>
         <module>managedbean1.0-test</module>
+        <module>di1.0-test</module>
     </modules>
 
 </project>



Mime
View raw message