svn commit: r1244418 - in /openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test: java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java resources/ resources/arquillian.xml

[rm...@apache.org]

Author: rmannibucau
Date: Wed Feb 15 09:42:05 2012
New Revision: 1244418

URL: http://svn.apache.org/viewvc?rev=1244418&view=rev
Log:
adding arquillian.xml for embedded case

Added:
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml
Modified:
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java?rev=1244418&r1=1244417&r2=1244418&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java Wed Feb 15 09:42:05 2012
@@ -52,13 +52,13 @@ public class EmbeddedTomEEContainerTest 
 
     @Test
     public void servletIsDeployed() throws Exception {
-        final String read = IOUtils.toString(new URL("http://localhost:8080/test/a-servlet").openStream());
+        final String read = IOUtils.toString(new URL("http://localhost:" + System.getProperty("tomee.http.port", "8080") + "/test/a-servlet").openStream());
         assertEquals("ok=true", read);
     }
 
     @Test
     public void restServiceIsDeployed() throws Exception {
-        final String read = IOUtils.toString(new URL("http://localhost:8080/test/rest/foo").openStream());
+        final String read = IOUtils.toString(new URL("http://localhost:" + System.getProperty("tomee.http.port", "8080") + "/test/rest/foo").openStream());
         assertEquals("foo", read);
     }
 }

Added: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml?rev=1244418&view=auto
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml (added)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml Wed Feb 15 09:42:05 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    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.
+-->
+<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="stopPort">-1</property>
+           </configuration>
+       </container>
+</arquillian>