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/04/23 21:41:30 UTC
svn commit: r937484 - in
/geronimo/server/trunk/testsuite/enterprise-testsuite: ./ appname-tests/
appname-tests/appname-client/ appname-tests/appname-client/src/
appname-tests/appname-client/src/main/
appname-tests/appname-client/src/main/java/ appname...
Author: gawor
Date: Fri Apr 23 19:41:29 2010
New Revision: 937484
URL: http://svn.apache.org/viewvc?rev=937484&view=rev
Log:
GERONIMO-5253: Tests for injecting java:app/AppName and java:module/ModuleName
Added:
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml (with props)
Modified:
geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,128 @@
+<?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>appname-tests</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>appname-client</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: AppName - Client</name>
+ <packaging>jar</packaging>
+
+ <description>This project executes testcases for your testsuite</description>
+
+ <properties>
+ <clientLogFile>${basedir}/target/client.log</clientLogFile>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.geronimo.test.appname.TestClient</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>clientLogFile</name>
+ <value>${clientLogFile}</value>
+ </property>
+ <property>
+ <name>appName</name>
+ <value>${artifactId}-${version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-client</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <phase>pre-integration-test</phase>
+ <id>run-client</id>
+ <goals>
+ <goal>run-client</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/AppNameClient/1.0/jar</moduleId>
+ <logOutput>true</logOutput>
+ <logFile>${clientLogFile}</logFile>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-client-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>JEE5/AppNameClientServer/1.0/jar</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
+
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java Fri Apr 23 19:41:29 2010
@@ -0,0 +1,49 @@
+/**
+ * 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.appname;
+
+import javax.annotation.Resource;
+
+public class TestClient {
+
+ @Resource(lookup="java:app/AppName")
+ private static String appName;
+
+ @Resource(lookup="java:module/ModuleName")
+ private static String moduleName;
+
+ public static void main(String [] args) throws Exception {
+
+ try {
+ test();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // needs to be forced because of a bug
+ System.exit(0);
+ }
+
+ public static void test() throws Exception {
+ System.out.println("AppName: " + appName);
+ System.out.println("ModuleName: " + moduleName);
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/java/org/apache/geronimo/test/appname/TestClient.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/applicationclient_1_4.xsd"
+ version="1.4">
+
+ <display-name>Test Client</display-name>
+
+</application-client>
+
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/application-client.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<application-client
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2"
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <dep:client-environment>
+ <dep:moduleId>
+ <dep:groupId>JEE5</dep:groupId>
+ <dep:artifactId>AppNameClient</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>jar</dep:type>
+ </dep:moduleId>
+ </dep:client-environment>
+
+ <dep:server-environment>
+ <dep:moduleId>
+ <dep:groupId>JEE5</dep:groupId>
+ <dep:artifactId>AppNameClientServer</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>jar</dep:type>
+ </dep:moduleId>
+ </dep:server-environment>
+
+</application-client>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/main/resources/META-INF/geronimo-application-client.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java Fri Apr 23 19:41:29 2010
@@ -0,0 +1,63 @@
+/**
+ * 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.appname;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.FileInputStream;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+
+public class ClientTest extends TestSupport {
+
+ @Test
+ public void testClient() throws Exception {
+ String outputFile = System.getProperty("clientLogFile");
+ assertNotNull(outputFile);
+ FileInputStream in = null;
+ try {
+ in = new FileInputStream(outputFile);
+ BufferedReader reader =
+ new BufferedReader(new InputStreamReader(in));
+ String output = toString(reader);
+
+ assertTrue("AppName", output.indexOf("AppName: " + System.getProperty("appName")) != -1);
+ assertTrue("ModuleName", output.indexOf("ModuleName: " + System.getProperty("appName")) != -1);
+
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+ private String toString(BufferedReader reader)
+ throws IOException {
+ StringBuffer buf = new StringBuffer();
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ buf.append(line).append("\n");
+ }
+ return buf.toString();
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/src/test/java/org/apache/geronimo/testsuite/appname/ClientTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,153 @@
+<?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>appname-tests</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>appname-ear</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: AppName - EAR</name>
+ <packaging>ear</packaging>
+
+ <!--
+ FIXME: Split this module up... one to build the ear, one to run the tests.
+ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>appname-war</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayName>AppName Test EAR</displayName>
+ <description>AppName Test EAR</description>
+ <version>1.4</version>
+ <modules>
+ <webModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>appname-war</artifactId>
+ <contextRoot>/appname</contextRoot>
+ <bundleFileName>web.war</bundleFileName>
+ </webModule>
+ </modules>
+ </configuration>
+ </plugin>
+
+ <!-- "ear" packaging doesn't compile test classes -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- "ear" packaging doesn't process test resources -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>appname</value>
+ </property>
+ <property>
+ <name>appName</name>
+ <value>${artifactId}-${version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,27 @@
+<?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.
+-->
+<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4">
+ <description>security Itest ear</description>
+ <display-name>security Itest ear</display-name>
+ <module>
+ <web>
+ <web-uri>web.war</web-uri>
+ <context-root>/appname</context-root>
+ </web>
+ </module>
+</application>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,34 @@
+<?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$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <moduleId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${pom.artifactId}</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </moduleId>
+ </environment>
+
+</application>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java Fri Apr 23 19:41:29 2010
@@ -0,0 +1,71 @@
+/**
+ * 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.appname;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+
+public class ServletTest extends TestSupport {
+
+ private String baseURL = "http://localhost:8080/";
+
+ @Test
+ public void testDataSource() throws Exception {
+ checkReply("/AppNameServlet");
+ }
+
+ private void checkReply(String address) throws Exception {
+ String warName = System.getProperty("webAppName");
+ assertNotNull(warName);
+ URL url = new URL(baseURL + warName + address);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setConnectTimeout(30 * 1000);
+ connection.setReadTimeout(30 * 1000);
+ try {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(connection
+ .getInputStream()));
+ assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
+ assertTrue("AppName", find(reader, "AppName: " + System.getProperty("appName")));
+ assertTrue("ModuleName", find(reader, "ModuleName: web"));
+ } finally {
+ connection.disconnect();
+ }
+ }
+
+ private boolean find(BufferedReader reader, String text) throws IOException {
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ if (line.indexOf(text) != -1) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+}
+
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/src/test/java/org/apache/geronimo/testsuite/appname/ServletTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,45 @@
+<?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>appname-tests</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>appname-war</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: AppName - WAR</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java Fri Apr 23 19:41:29 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.test.appname;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TestServlet extends HttpServlet {
+
+ @Resource(lookup="java:app/AppName")
+ private String appName;
+
+ @Resource(lookup="java:module/ModuleName")
+ private String moduleName;
+
+
+ public void init() {
+ System.out.println("Test Servlet init");
+ }
+
+ protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ PrintWriter out = response.getWriter();
+ out.println("AppName: " + appName);
+ out.println("ModuleName: " + moduleName);
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/java/org/apache/geronimo/test/appname/TestServlet.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+ 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">
+ <environment>
+ <moduleId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${pom.artifactId}</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </moduleId>
+ <dependencies>
+
+ </dependencies>
+ </environment>
+
+ <context-root>/appname</context-root>
+
+</web-app>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,38 @@
+<?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"
+ >
+
+ <display-name>AppName Test WAR</display-name>
+
+ <servlet>
+ <servlet-name>AppNameServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.test.appname.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>AppNameServlet</servlet-name>
+ <url-pattern>/AppNameServlet</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html Fri Apr 23 19:41:29 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="AppNameServlet">AppNameServlet</a>
+</ul>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-war/src/main/webapp/index.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml?rev=937484&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml Fri Apr 23 19:41:29 2010
@@ -0,0 +1,44 @@
+<?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>enterprise-testsuite</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>appname-tests</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: AppName Tests</name>
+
+ <modules>
+ <module>appname-war</module>
+ <module>appname-client</module>
+ <module>appname-ear</module>
+ </modules>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=937484&r1=937483&r2=937484&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Fri Apr 23 19:41:29 2010
@@ -55,6 +55,7 @@
<module>jpa-tests</module>
<module>sec-client-tests</module>
<module>datasource-test</module>
+ <module>appname-tests</module>
</modules>
</project>