Author: dblevins
Date: Thu Oct 25 05:34:36 2012
New Revision: 1401980
URL: http://svn.apache.org/viewvc?rev=1401980&view=rev
Log:
restored svn history
Added:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
- copied, changed from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/Hello.java
- copied unchanged from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/Hello.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/Hello2.java
- copied unchanged from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/Hello2.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/HelloWS.java
- copied unchanged from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/HelloWS.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/HelloWS2.java
- copied unchanged from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/HelloWS2.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
- copied, changed from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
- copied, changed from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/LengthCalculator.java
- copied unchanged from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/LengthCalculator.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
- copied, changed from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
- copied, changed from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/org/apache/openejb/arquillian/tests/jaxws/dd/ejb-jar.xml
- copied unchanged from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/resources/org/apache/openejb/arquillian/tests/jaxws/dd/ejb-jar.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/org/apache/openejb/arquillian/tests/jaxws/openejbjar/openejb-jar.xml
- copied unchanged from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/resources/org/apache/openejb/arquillian/tests/jaxws/openejbjar/openejb-jar.xml
Copied:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
(from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml&r1=1373163&r2=1401980&rev=1401980&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
Thu Oct 25 05:34:36 2012
@@ -1,375 +1,45 @@
-<?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. -->
-<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/xsd/maven-4.0.0.xsd";>
+<?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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>arquillian</artifactId>
+ <artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
</parent>
- <artifactId>arquillian-tomee-tests</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Arquillian Adaptors Parent :: Tests</name>
+ <artifactId>arquillian-tomee-jaxws-tests</artifactId>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Tests :: JAXWS</name>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>${javaee-api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.0.0-alpha-1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
- <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
- <version>1.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>ziplock</artifactId>
+ <artifactId>tomee-webservices</artifactId>
<version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${version.arquillian}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <artifactId>commons-lang3</artifactId>
- <groupId>org.apache.commons</groupId>
- <version>${commons-lang3.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tomee-webservices</artifactId>
- <version>${tomee.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
- <version>${version.shrinkwrap.descriptor}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
- <version>${version.shrinkwrap.descriptor}</version>
- </dependency>
-
</dependencies>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <configuration>
- <portNames>
- <portName>tomee.http.port</portName>
- <portName>tomee.shutdown.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>copy-test-libs</id>
- <phase>process-test-resources</phase>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </artifactItem>
- </artifactItems>
- <outputDirectory>
- ${project.build.directory}/test-libs
- </outputDirectory>
- <stripVersion>true</stripVersion>
- </configuration>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>tomee-embedded</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-embedded</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>tomee-webprofile-remote</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <tomee.classifier>webprofile</tomee.classifier>
- <tomee.version>${tomee.version}</tomee.version>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/jaxrs/**</exclude>
- <exclude>**/jaxws/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <classifier>webprofile</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>tomee-plus-remote</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <tomee.classifier>plus</tomee.classifier>
- <tomee.version>${tomee.version}</tomee.version>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${tomee.version}</version>
- <classifier>plus</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>tomee-webprofile-webapp</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <tomee.artifactId>tomee-webapp</tomee.artifactId>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/jaxrs/**</exclude>
- <exclude>**/jaxws/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-webapp-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>tomee-webapp</artifactId>
- <version>${tomee.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>tomee-plus-webapp</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
- <tomee.version>${tomee.version}</tomee.version>
- <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>arquillian-tomee-webapp-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>tomee-plus-webapp</artifactId>
- <version>${tomee.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!--
- Added to make it easy to quickly verify if something "should" work
- -->
- <id>glassfish-embedded</id>
- <properties>
- <version.glassfish>3.1.2-b16</version.glassfish>
-
<version.arquillian.glassfish.embedded>1.0.0.CR2</version.arquillian.glassfish.embedded>
- <version.mockito>1.9.0</version.mockito>
-
<version.maven.embedded.glassfish.plugin>3.1.1</version.maven.embedded.glassfish.plugin>
- <version.maven.war.plugin>2.1.1</version.maven.war.plugin>
- <version.maven.compiler.plugin>2.3.2</version.maven.compiler.plugin>
- <version.maven.failsafe.plugin>2.11</version.maven.failsafe.plugin>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${version.arquillian}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.extras</groupId>
- <artifactId>glassfish-embedded-all</artifactId>
- <version>${version.glassfish}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-embedded-3.1</artifactId>
- <version>${version.arquillian.glassfish.embedded}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
+ <properties>
+ <distribution.under.test>plus</distribution.under.test>
+ <webapp.under.test>${distribution.under.test}-</webapp.under.test>
+ </properties>
</project>
Copied:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
(from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java&r1=1373163&r2=1401980&rev=1401980&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
Thu Oct 25 05:34:36 2012
@@ -17,17 +17,18 @@
package org.apache.openejb.arquillian.tests.jaxws;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import org.apache.ziplock.WebModule;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.URL;
+
import static org.junit.Assert.assertEquals;
@RunWith(Arquillian.class)
@@ -38,7 +39,8 @@ public class JAXWSTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
- return new WebModule(JAXWSTest.class).getArchive();
+ return ShrinkWrap.create(WebArchive.class,
JAXWSTest.class.getName().concat(".war"))
+ .addClasses(Hello.class, Hello2.class, HelloWS.class,
HelloWS2.class);
}
@Test
Copied:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
(from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java&r1=1373163&r2=1401980&rev=1401980&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
Thu Oct 25 05:34:36 2012
@@ -47,13 +47,10 @@ public class JAXWSDDTest {
final WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
.version("3.0");
- final WebArchive archive = ShrinkWrap.create(WebArchive.class,
JAXWSDDTest.class.getSimpleName() + ".war")
+ return ShrinkWrap.create(WebArchive.class,
JAXWSDDTest.class.getSimpleName() + ".war")
.setWebXML(new StringAsset(descriptor.exportAsString()))
- .addAsLibraries(JarLocation.jarLocation(Test.class))
.addClass(Hello.class).addClass(HelloWS.class)
.addAsWebInfResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/jaxws/dd/ejb-jar.xml"),
"ejb-jar.xml");
-
- return archive;
}
@Test
Copied:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
(from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java&r1=1373163&r2=1401980&rev=1401980&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/openejbjar/OpenEJBJarForAddressDeploymentTest.java
Thu Oct 25 05:34:36 2012
@@ -36,12 +36,11 @@ public class OpenEJBJarForAddressDeploym
@Deployment(testable = false)
public static WebArchive createDeployment() {
- return new
WebModule(OpenEJBJarForAddressDeploymentTest.class).getArchive();
+ return new WebModule(OpenEJBJarForAddressDeploymentTest.class,
OpenEJBJarForAddressDeploymentTest.class).getArchive();
}
@Test
public void invoke() throws Exception {
- final String s =
OpenEJBJarForAddressDeploymentTest.class.getSimpleName();
final URL url = new URL(deployedUrl.toExternalForm() +
"webservices/foo/bar/my-ws?wsdl");
final String wsdl = IO.slurp(url);
assertTrue(wsdl.contains("LengthCalculator"));
Copied:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
(from r1373163,
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/resources/arquillian.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/resources/arquillian.xml&r1=1373163&r2=1401980&rev=1401980&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
Thu Oct 25 05:34:36 2012
@@ -16,19 +16,48 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<arquillian
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
- <container qualifier="tomee" default="true">
- <configuration>
- <property name="httpPort">-1</property>
- <property name="ajpPort">-1</property>
- <property name="stopPort">-1</property>
- <property name="dir">target/apache-tomee-remote</property>
- <property
name="appWorkingDir">target/arquillian-test-working-dir</property>
- <property name="properties">
-
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
- </property>
- </configuration>
- </container>
+<arquillian xmlns="http://jboss.org/schema/arquillian";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
+ <container qualifier="tomee-embedded" default="true">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="dir">target/apache-tomee-remote</property>
+ <property
name="appWorkingDir">target/arquillian-test-working-dir</property>
+ <property name="properties">
+ My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
+ </property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-remote">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="dir">target/apache-tomee-remote</property>
+ <property
name="appWorkingDir">target/arquillian-test-working-dir</property>
+ <property name="properties">
+ My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
+ </property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-webapp">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="dir">target/apache-tomee-remote</property>
+ <property
name="appWorkingDir">target/arquillian-test-working-dir</property>
+ <property name="properties">
+ My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
+ </property>
+ </configuration>
+ </container>
</arquillian>
\ No newline at end of file
