You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/09/30 04:52:03 UTC
svn commit: r1002936 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite: di1.0-test/
di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/
di1.0-test/src/main/resources/META-INF/openwebbeans/
di1.0-test/src/test/java/org/apache/geronimo/t...
Author: gawor
Date: Thu Sep 30 02:52:02 2010
New Revision: 1002936
URL: http://svn.apache.org/viewvc?rev=1002936&view=rev
Log:
fix formatting
Removed:
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/META-INF/openwebbeans/
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml Thu Sep 30 02:52:02 2010
@@ -1,117 +1,112 @@
<?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.
+ 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>
+ <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>
+ <scope>provided</scope>
</dependency>
-
-
<!-- JSR-299 API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
-
<!-- JSR-330 API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <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>
-
+ <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>
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Apple.java Thu Sep 30 02:52:02 2010
@@ -24,19 +24,19 @@ import javax.inject.Named;
@Named("apl")
public class Apple implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private String message;
+ private String message;
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
- public void eat() {
- }
+ public void eat() {
+ }
}
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/AppleBean.java Thu Sep 30 02:52:02 2010
@@ -21,22 +21,26 @@ package org.apache.geronimo.testsuite.di
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";
- }
+ @Inject @Big
+ private Provider<Apple> bigAppleProvider;
+
+ @Inject @Little
+ private 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";
+ }
}
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Big.java Thu Sep 30 02:52:02 2010
@@ -17,7 +17,9 @@
* 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
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/BigApple.java Thu Sep 30 02:52:02 2010
@@ -26,23 +26,24 @@ import javax.inject.Singleton;
@Named("big")
public class BigApple extends Apple {
- private static final long serialVersionUID = 1L;
- private int no = 1;
+ private static final long serialVersionUID = 1L;
- public void setNo(int no) {
- this.no = no;
- }
+ private int no = 1;
- public int getNo() {
- return no;
- }
+ public void setNo(int no) {
+ this.no = 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~");
- }
- }
+ 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~");
+ }
+ }
}
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/Little.java Thu Sep 30 02:52:02 2010
@@ -17,7 +17,9 @@
* 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
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/java/org/apache/geronimo/testsuite/di/app/LittleApple.java Thu Sep 30 02:52:02 2010
@@ -19,14 +19,15 @@
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;
+ private static final long serialVersionUID = 1L;
- public void eat() {
- setMessage("Congratulations! There are enough small apples!");
- }
+ public void eat() {
+ setMessage("Congratulations! There are enough small apples!");
+ }
}
Modified: 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=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/test/java/org/apache/geronimo/testsuite/di/TestDi.java Thu Sep 30 02:52:02 2010
@@ -25,26 +25,23 @@ import org.apache.geronimo.testsupport.S
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!"));
- }
+ @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!"));
+ }
}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml?rev=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml Thu Sep 30 02:52:02 2010
@@ -1,131 +1,123 @@
<?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. -->
-
+<!--
+ 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>
-<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>el2.2-test</artifactId>
- <name>Geronimo TestSuite :: Java EE 6 Testsuite :: el2.2-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-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>false</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <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>
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>javaee6-testsuite</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>el2.2-test</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: el2.2-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-jsp_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archiveClasses>false</archiveClasses>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <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>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java?rev=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/main/java/org/apache/geronimo/testsuite/el22/app/User.java Thu Sep 30 02:52:02 2010
@@ -15,27 +15,34 @@
* limitations under the License.
*/
package org.apache.geronimo.testsuite.el22.app;
+
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
+
@ManagedBean
@RequestScoped
public class User {
- private String name;
- private int age;
+ private String name;
+
+ private int age;
+
+ public String getName() {
+ return name;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
- public String getName() {
- return name;
- }
- public int getAge() {
- return age;
- }
- public void setName(String name) {
- this.name = name;
- }
- public void setAge(int age) {
- this.age = age;
- }
- public int calYear(int x) {
- return (age + x);
- }
-}
\ No newline at end of file
+ public int calYear(int x) {
+ return (age + x);
+ }
+}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java?rev=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/src/test/java/org/apache/geronimo/testsuite/el22/TestEL.java Thu Sep 30 02:52:02 2010
@@ -24,16 +24,16 @@ import org.apache.geronimo.testsupport.S
public class TestEL extends SeleniumTestSupport {
- @Test
- public void testMethodWithParameters() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- selenium.selectFrame("sampleDocumentFrame");
- selenium.type("el:name", "qq");
- selenium.type("el:age", "6");
- selenium.click("el:button");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("Hello,qq"));
- assertTrue(selenium.isTextPresent("You will be 11 years old after five years."));
- }
+ @Test
+ public void testMethodWithParameters() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+ selenium.selectFrame("sampleDocumentFrame");
+ selenium.type("el:name", "qq");
+ selenium.type("el:age", "6");
+ selenium.click("el:button");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("Hello,qq"));
+ assertTrue(selenium.isTextPresent("You will be 11 years old after five years."));
+ }
}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml?rev=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml Thu Sep 30 02:52:02 2010
@@ -15,108 +15,92 @@
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">
+<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>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>javaee6-testsuite</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>jsp2.2-test</artifactId>
- <name>Geronimo TestSuite :: Java EE 6 Testsuite :: jsp2.2-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-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.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}/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>
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>javaee6-testsuite</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jsp2.2-test</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: jsp2.2-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-jsp_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>2.0.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}/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>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java?rev=1002936&r1=1002935&r2=1002936&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/src/test/java/org/apache/geronimo/testsuite/jsp22/TestJSP.java Thu Sep 30 02:52:02 2010
@@ -24,47 +24,46 @@ import org.apache.geronimo.testsupport.S
public class TestJSP extends SeleniumTestSupport {
- @Test
- public void testWithDefaultContentType() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- selenium.click("link=Page with contentType.");
- waitForPageLoad();
- assertTrue(selenium
- .isTextPresent("Page with contentType uses tag:default-content-type which value is text/xml."));
- assertFalse(selenium.isTextPresent("<html>"));
- }
+ @Test
+ public void testWithDefaultContentType() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+ selenium.click("link=Page with contentType.");
+ waitForPageLoad();
+ assertTrue(selenium
+ .isTextPresent("Page with contentType uses tag:default-content-type which value is text/xml."));
+ assertFalse(selenium.isTextPresent("<html>"));
+ }
- // XML page test error in Selenium. This test is excluded at this time.
- @Test
- public void testWithoutDefaultContentType() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- selenium.click("link=Page without contentType.");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("<html>"));
- assertTrue(selenium
- .isTextPresent("Page without contentType uses tag: default-content-type which value is text/xml."));
- }
+ // XML page test error in Selenium. This test is excluded at this time.
+ @Test
+ public void testWithoutDefaultContentType() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+ selenium.click("link=Page without contentType.");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("<html>"));
+ assertTrue(selenium
+ .isTextPresent("Page without contentType uses tag: default-content-type which value is text/xml."));
+ }
- @Test
- public void testWithErrorNamespace() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- selenium.click("link=Page with tag: error-on-undeclared-namespace = true.");
- waitForPageLoad();
- assertTrue(selenium
- .isTextPresent("A custom tag was encountered with an undeclared namespace [qq]"));
- }
+ @Test
+ public void testWithErrorNamespace() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+ selenium.click("link=Page with tag: error-on-undeclared-namespace = true.");
+ waitForPageLoad();
+ assertTrue(selenium
+ .isTextPresent("A custom tag was encountered with an undeclared namespace [qq]"));
+ }
- @Test
- public void testWithoutErrorNamespace() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- selenium.click("link=Page with tag: error-on-undeclared-namespace = false.");
- waitForPageLoad();
- assertTrue(selenium
- .isTextPresent("Page with tag: error-on-undeclared-namespace = false."));
- assertTrue(selenium.isTextPresent("error namespace value"));
- }
+ @Test
+ public void testWithoutErrorNamespace() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+ selenium.click("link=Page with tag: error-on-undeclared-namespace = false.");
+ waitForPageLoad();
+ assertTrue(selenium.isTextPresent("Page with tag: error-on-undeclared-namespace = false."));
+ assertTrue(selenium.isTextPresent("error namespace value"));
+ }
}