geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r496565 - in /geronimo/server/trunk: configs/webservices-common/ testsuite/webservices-testsuite/jaxr-tests/ testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/ testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/ testsuite/webservices...
Date Tue, 16 Jan 2007 01:33:40 GMT
Author: djencks
Date: Mon Jan 15 17:33:38 2007
New Revision: 496565

URL: http://svn.apache.org/viewvc?view=rev&rev=496565
Log:
GERONIMO-2733 get scout in the appropriate classloader and a jaxr functional test

Added:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java   (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml   (with props)
Modified:
    geronimo/server/trunk/configs/webservices-common/pom.xml

Modified: geronimo/server/trunk/configs/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webservices-common/pom.xml?view=diff&rev=496565&r1=496564&r2=496565
==============================================================================
--- geronimo/server/trunk/configs/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/configs/webservices-common/pom.xml Mon Jan 15 17:33:38 2007
@@ -51,6 +51,12 @@
             <artifactId>jaxb-impl</artifactId>
         </dependency>
 
+        <!-- JAXR implementation -->
+        <dependency>
+            <groupId>scout</groupId>
+            <artifactId>scout</artifactId>
+        </dependency>
+
     </dependencies>
     
 </project>

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Mon Jan 15 17:33:38 2007
@@ -0,0 +1,132 @@
+<?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>jaxr-tests</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jaxr-ejb</artifactId>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: JAXR EJB</name>
+    <packaging>jar</packaging>
+
+    <description>This project executes testcases for your testsuite</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <version>${version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                        <!-- 
+                        Merging the configuration of this plugin with the one it inherits.
+                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                        This plugin executes twice in Maven 2.0.4 (http://jira.codehaus.org/browse/MNG-2221)
+                        Maven.2.0.5 will fix it soon.
+                        -->
+                        <configuration>
+                            <grandParent>true</grandParent>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-ejb</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                        </configuration>
+                    </execution>
+                            
+                    <execution>
+                        <id>undeploy-ejb-as-moduleId</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleId>JEE5/JAXREJB/1.1/car</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,61 @@
+/**
+ *  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;
+
+import java.rmi.RemoteException;
+import java.util.List;
+import java.util.ArrayList;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+public class JAXRBean implements SessionBean {
+
+    private SessionContext sessionContext;
+
+    public void ejbCreate() {
+    }
+
+    public void ejbRemove() {
+    }
+
+    public void ejbActivate() {
+    }
+
+    public void ejbPassivate() {
+    }
+
+    public void setSessionContext(SessionContext sessionContext) {
+        this.sessionContext = sessionContext;
+    }
+    
+    public List testJAXR() throws RemoteException {
+        List output = new ArrayList();
+        try {
+            JAXRTest t = new JAXRTest();
+            output.add(t.getImplementation());
+            t.test();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RemoteException("Error", e);
+        }
+        
+        return output;
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,29 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.test;
+
+import java.rmi.RemoteException;
+import javax.ejb.EJBHome;
+import javax.ejb.CreateException;
+
+public interface JAXRHome extends EJBHome {
+    
+    public JAXRObject create() throws RemoteException, CreateException;
+    
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,29 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.test;
+
+import java.rmi.RemoteException;
+import java.util.List;
+import javax.ejb.EJBObject;
+
+public interface JAXRObject extends EJBObject {
+    
+    public List testJAXR() throws RemoteException;
+
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,42 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.test;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.registry.ConnectionFactory;
+
+public class JAXRTest {
+
+    private ConnectionFactory connFactory;
+
+    public JAXRTest() throws Exception {
+        this.connFactory = ConnectionFactory.newInstance(); 
+    }
+
+    public String getImplementation() {
+        return this.connFactory.getClass().getName();
+    }
+
+    public void test() throws Exception {
+        // Not sure what to do here
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml Mon Jan 15 17:33:38 2007
@@ -0,0 +1,31 @@
+<?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.
+-->
+<ejb-jar 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/ejb-jar_2_1.xsd" version="2.1">
+  <enterprise-beans>
+    <session>
+      <ejb-name>JAXR</ejb-name>
+      <home>org.apache.geronimo.test.JAXRHome</home>
+      <remote>org.apache.geronimo.test.JAXRObject</remote>
+      <ejb-class>org.apache.geronimo.test.JAXRBean</ejb-class>
+      <session-type>Stateless</session-type>
+      <transaction-type>Container</transaction-type>
+    </session>
+  </enterprise-beans>
+</ejb-jar>

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml Mon Jan 15 17:33:38 2007
@@ -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.
+-->
+<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
+  xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
+  xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+    <environment>
+        <moduleId>
+            <groupId>JEE5</groupId>
+            <artifactId>JAXREJB</artifactId>
+            <version>1.1</version>
+            <type>car</type>
+        </moduleId>
+   </environment>
+
+ <enterprise-beans>
+    <session>
+      <ejb-name>JAXR</ejb-name>
+      <jndi-name>JAXR</jndi-name>
+    </session>
+  </enterprise-beans>
+
+</openejb-jar>

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,66 @@
+/**
+ *  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.testset;
+
+import java.util.Properties;
+import java.util.List;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.apache.geronimo.test.JAXRHome;
+import org.apache.geronimo.test.JAXRObject;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+
+public class EJBJAXRTest extends TestSupport {
+
+    @Test
+    public void testEJB() throws Exception {
+        Properties p = new Properties();
+    
+        p.put("java.naming.factory.initial", 
+              "org.apache.openejb.client.RemoteInitialContextFactory");
+        p.put("java.naming.provider.url", 
+              "127.0.0.1:4201");
+        p.put("java.naming.security.principal", 
+              "myuser");
+        p.put("java.naming.security.credentials", 
+              "mypass");    
+        
+        InitialContext ctx = new InitialContext(p);
+        
+        Object obj = ctx.lookup("/JAXR");
+        
+        JAXRHome ejbHome = 
+            (JAXRHome)PortableRemoteObject.narrow(obj, JAXRHome.class);
+
+        JAXRObject ejbObject = ejbHome.create();
+    
+        List factoryList = ejbObject.testJAXR();
+
+        assertEquals(1, factoryList.size());
+        assertEquals("Implementation", 
+                     "org.apache.ws.scout.registry.ConnectionFactoryImpl",
+                     factoryList.get(0));
+
+        System.out.println( factoryList );
+    }
+    
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml Mon Jan 15 17:33:38 2007
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>jaxr-tests</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jaxr-war</artifactId>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: JAXR WAR</name>
+    <packaging>war</packaging>
+
+    <description>This project executes testcases for your testsuite</description>
+
+    <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+                <scope>provided</scope>
+            </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <version>${version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                        <!-- 
+                        Merging the configuration of this plugin with the one it inherits.
+                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                        This plugin executes twice in Maven 2.0.4 (http://jira.codehaus.org/browse/MNG-2221)
+                        Maven.2.0.5 will fix it soon.
+                        -->
+                        <configuration>
+                            <grandParent>true</grandParent>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>webAppName</name>
+                            <value>${artifactId}-${version}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                    <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.jsp, **/*.xml, **/*.class</warSourceIncludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</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}/${artifactId}-${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>JEE5/JAXRServlet/1.1/car</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,54 @@
+/**
+ *  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;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class JAXRServlet extends HttpServlet {
+
+    public void doGet(HttpServletRequest theRequest,
+                      HttpServletResponse theResponse) 
+        throws IOException {
+
+        PrintWriter pw = theResponse.getWriter();
+
+        theResponse.setContentType("text/html");
+        pw.println("<html><head><title>Servlet</title></head>");
+        pw.println("<body>");
+
+        try {
+            JAXRTest test = new JAXRTest();
+            pw.println(test.getImplementation());
+            test.test();
+        } catch (Exception e) {
+            e.printStackTrace();
+            IOException exception = new IOException("Error");
+            exception.initCause(e);
+            throw exception;
+        }
+        
+        pw.println("</body></html>");
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,42 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.test;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.registry.ConnectionFactory;
+
+public class JAXRTest {
+
+    private ConnectionFactory connFactory;
+
+    public JAXRTest() throws Exception {
+        this.connFactory = ConnectionFactory.newInstance(); 
+    }
+
+    public String getImplementation() {
+        return this.connFactory.getClass().getName();
+    }
+
+    public void test() throws Exception {
+        // Not sure what to do here
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp Mon Jan 15 17:33:38 2007
@@ -0,0 +1,46 @@
+<?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.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+  version="1.2">
+<jsp:directive.page contentType="text/html"/>
+<jsp:directive.page import="java.io.IOException"/>
+<jsp:directive.page import="org.apache.geronimo.test.JAXRTest"/>
+
+<html><head><title>JSP</title></head>
+<body>
+
+<jsp:scriptlet>
+// Note we need to declare CDATA because we don't escape the less than symbol
+<![CDATA[
+        try {
+            JAXRTest test = new JAXRTest();
+            out.println(test.getImplementation());
+            test.test();
+        } catch (Exception e) {
+            e.printStackTrace();
+            IOException exception = new IOException("Error");
+            exception.initCause(e);
+            throw exception;
+        }
+]]>
+</jsp:scriptlet>
+
+</body></html>
+</jsp:root>

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml Mon Jan 15 17:33:38 2007
@@ -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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
+  <dep:environment>
+    <dep:moduleId>
+      <dep:groupId>JEE5</dep:groupId>
+      <dep:artifactId>JAXRServlet</dep:artifactId>
+      <dep:version>1.1</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+  </dep:environment>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml Mon Jan 15 17:33:38 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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/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/web-app_2_4.xsd"
+    version="2.4">
+    <servlet>
+        <servlet-name>JAXRServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.test.JAXRServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>JAXRServlet</servlet-name>
+        <url-pattern>/JAXRServlet</url-pattern>
+    </servlet-mapping>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java Mon Jan 15 17:33:38 2007
@@ -0,0 +1,73 @@
+/**
+ *  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.testset;
+
+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 WebJAXRTest extends TestSupport {
+
+    private String baseURL = "http://localhost:8080/";
+
+    @Test
+    public void testServlet() throws Exception {
+        checkReply("/JAXRServlet");
+    }
+
+    @Test
+    public void testJSP() throws Exception {
+        checkReply("/JAXRJSP.jsp");
+    }
+
+    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();
+        try {
+            BufferedReader reader = 
+                new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
+            assertTrue("Factory", 
+                       find(reader, "org.apache.ws.scout.registry.ConnectionFactoryImpl"));
+        } 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/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml?view=auto&rev=496565
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml (added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml Mon Jan 15 17:33:38 2007
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>webservices-testsuite</artifactId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jaxr-tests</artifactId>
+    <packaging>pom</packaging>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: JAXR</name>
+    <description>Geronimo jee5-testsuite testsuite created from an archetype.</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <modules>
+                <module>jaxr-war</module>
+                <module>jaxr-ejb</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message