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/05/21 20:05:20 UTC
svn commit: r947103 - in /geronimo/server/trunk/testsuite: ./
aries-testsuite/ aries-testsuite/simple/ aries-testsuite/simple/simple-api/
aries-testsuite/simple/simple-api/src/
aries-testsuite/simple/simple-api/src/main/
aries-testsuite/simple/simple-a...
Author: gawor
Date: Fri May 21 18:05:18 2010
New Revision: 947103
URL: http://svn.apache.org/viewvc?rev=947103&view=rev
Log:
simple tests to test eba deployment
Added:
geronimo/server/trunk/testsuite/aries-testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/pom.xml (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/
geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/eba/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/eba/META-INF/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/eba/META-INF/APPLICATION.MF
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml (with props)
geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html (with props)
Modified:
geronimo/server/trunk/testsuite/pom.xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/pom.xml?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/pom.xml Fri May 21 18:05:18 2010
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>testsuite</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aries-testsuite</artifactId>
+ <name>Geronimo TestSuite :: Aries Testsuite</name>
+ <packaging>pom</packaging>
+
+ <description>
+ Geronimo Aries testsuite.
+ </description>
+
+ <modules>
+ <module>simple</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>eba-maven-plugin</artifactId>
+ <version>0.1-incubating</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml Fri May 21 18:05:18 2010
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>aries-testsuite</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>simple</artifactId>
+ <name>Geronimo TestSuite :: Aries Testsuite :: Simple Test</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>simple-api</module>
+ <module>simple-wab</module>
+ <module>simple-eba</module>
+ </modules>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml Fri May 21 18:05:18 2010
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>simple</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>simple-api</artifactId>
+ <name>Geronimo TestSuite :: Aries Testsuite :: Simple API</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java Fri May 21 18:05:18 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.test.eba.api;
+
+public class Hello {
+
+ public String sayHello(String name) {
+ return "Hello " + name;
+ }
+}
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-api/src/main/java/org/apache/geronimo/test/eba/api/Hello.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml Fri May 21 18:05:18 2010
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>simple</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>simple-eba</artifactId>
+ <name>Geronimo TestSuite :: Aries Testsuite :: Simple EBA</name>
+ <packaging>eba</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>simple-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>simple-wab</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>eba-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <generateManifest>false</generateManifest>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>simple</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-ears</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.eba</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-ear-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>application/${project.artifactId}/1.0.0/eba</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/eba/META-INF/APPLICATION.MF
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/eba/META-INF/APPLICATION.MF?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/eba/META-INF/APPLICATION.MF (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/main/eba/META-INF/APPLICATION.MF Fri May 21 18:05:18 2010
@@ -0,0 +1,9 @@
+Manifest-Version: 1
+Application-ManifestVersion: 1
+Application-SymbolicName: simple-eba
+Application-Version: 1.0
+Application-Name: Geronimo TestSuite :: Aries Testsuite :: Simple EBA
+Application-Description: Geronimo Aries testsuite.
+Application-Content: simple-api,
+ simple-wab
+
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java Fri May 21 18:05:18 2010
@@ -0,0 +1,69 @@
+/**
+ * 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.eba;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.geronimo.testsupport.HttpUtils;
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+
+public class EBATest extends TestSupport {
+
+ private String baseURL = "http://localhost:8080/";
+
+ @Test
+ public void testServlet() throws Exception {
+ checkReply("/SampleServlet");
+ }
+
+
+ private void checkReply(String address)
+ throws Exception {
+ String warName = System.getProperty("webAppName");
+ assertNotNull(warName);
+ URL url = new URL(baseURL + warName + address);
+ /**
+ * WABs are deployed asynchronously so it might take a
+ * bit to actually invoke the servlet.
+ */
+ String reply = doGET(url, 6, 10 * 1000);
+ assertTrue("WAB",
+ reply.contains("Hello Web Application Bundle"));
+ }
+
+ private String doGET(URL url, int repeat, long delay) {
+ for (int i = 0; i < repeat; i++) {
+ try {
+ return HttpUtils.doGET(url);
+ } catch (IOException e) {
+ // ignore
+ try {
+ Thread.sleep(delay);
+ } catch (Exception ee) {
+ break;
+ }
+ }
+ }
+ fail("Did not get servlet response in time");
+ return "";
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml Fri May 21 18:05:18 2010
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>simple</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>simple-wab</artifactId>
+ <name>Geronimo TestSuite :: Aries Testsuite :: Simple WAB</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>simple-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Web-ContextPath>/simple</Web-ContextPath>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Private-Package>org.apache.geronimo.test.eba</Private-Package>
+ <Export-Package>!org.apache.geronimo.test.eba</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java Fri May 21 18:05:18 2010
@@ -0,0 +1,46 @@
+/**
+ * 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.test.eba;
+
+import org.apache.geronimo.test.eba.api.Hello;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class SampleServlet extends HttpServlet {
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ doPost(request,response);
+ }
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ Hello hello = new Hello();
+
+ PrintWriter out = response.getWriter();
+ out.println("<html><head><title>Sample Wab Application Bundle</title></head></html>");
+ out.println("<body><h1>");
+ out.println(hello.sayHello("Web Application Bundle"));
+ out.println("</h1></body></html>");
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/java/org/apache/geronimo/test/eba/SampleServlet.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml Fri May 21 18:05:18 2010
@@ -0,0 +1,41 @@
+<?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" version="2.5"
+ metadata-complete="true">
+
+ <display-name>SampleServlet</display-name>
+
+ <servlet>
+ <description></description>
+ <display-name>SampleServlet</display-name>
+ <servlet-name>SampleServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.test.eba.SampleServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SampleServlet</servlet-name>
+ <url-pattern>/SampleServlet</url-pattern>
+ <url-pattern>/SampleServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html?rev=947103&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html Fri May 21 18:05:18 2010
@@ -0,0 +1,19 @@
+<!--
+ 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.
+-->
+<ul>
+<li><a href="SampleServlet">test</a>
+</ul>
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/index.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=947103&r1=947102&r2=947103&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Fri May 21 18:05:18 2010
@@ -191,6 +191,7 @@
<module>security-testsuite</module>
<module>web-testsuite</module>
<module>webservices-testsuite</module>
+ <module>aries-testsuite</module>
</modules>
<profiles>