You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/09/13 21:53:39 UTC
svn commit: r1384495 - in /openejb/trunk/openejb:
arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/
arquillian/arquillian-to...
Author: rmannibucau
Date: Thu Sep 13 19:53:37 2012
New Revision: 1384495
URL: http://svn.apache.org/viewvc?rev=1384495&view=rev
Log:
making tomee arquillian tests passing
Added:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java (contents, props changed)
- copied, changed from r1382650, openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java (contents, props changed)
- copied, changed from r1382650, openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml
- copied, changed from r1382650, openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/apache/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/apache/openejb/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/apache/openejb/arquillian/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/apache/openejb/arquillian/tests/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/apache/openejb/arquillian/tests/jms/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/apache/openejb/arquillian/tests/jms/dummy.xhtml (props changed)
- copied unchanged from r1382650, openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/jms/dummy.xhtml
Removed:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/jms/
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Thu Sep 13 19:53:37 2012
@@ -257,21 +257,21 @@ public class Setup {
}
public static void configureSystemProperties(final File openejbHome, final TomEEConfiguration configuration) {
- final Properties props = new Properties();
+ final StringBuilder builder = new StringBuilder();
final File systemProperties = new File(openejbHome, "conf/system.properties");
if (systemProperties.exists()) {
try {
- org.apache.openejb.loader.IO.readProperties(systemProperties);
+ builder.append(org.apache.openejb.loader.IO.slurp(systemProperties));
} catch (IOException e) {
LOGGER.log(Level.SEVERE, "can't read " + systemProperties.getAbsolutePath(), e);
}
}
- props.putAll(configuration.systemProperties());
+ builder.append("\n").append(configuration.systemProperties());
FileWriter writer = null;
try {
writer = new FileWriter(systemProperties);
- props.store(writer, "");
+ writer.write(builder.toString());
} catch (IOException e) {
LOGGER.log(Level.SEVERE, "can't save system properties " + systemProperties.getAbsolutePath(), e);
return;
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java Thu Sep 13 19:53:37 2012
@@ -17,27 +17,23 @@
package org.apache.openejb.arquillian.common;
-import org.apache.openejb.OpenEJBRuntimeException;
import org.jboss.arquillian.container.spi.ConfigurationException;
import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
public class TomEEConfiguration implements ContainerConfiguration {
- private boolean exportConfAsSystemProperty = false;
- private int httpPort = 8080;
- private int stopPort = 8005;
- private String dir = System.getProperty("java.io.tmpdir") + "/arquillian-apache-tomee";
- private String appWorkingDir = System.getProperty("java.io.tmpdir");
- private String host = "localhost";
- private String serverXml = null;
- private String properties = "";
- private String portRange = ""; // only used if port < 0, empty means whatever, can be "1024-65535"
+ protected boolean exportConfAsSystemProperty = false;
+ protected int httpPort = 8080;
+ protected int stopPort = 8005;
+ protected String dir = System.getProperty("java.io.tmpdir") + "/arquillian-apache-tomee";
+ protected String appWorkingDir = System.getProperty("java.io.tmpdir");
+ protected String host = "localhost";
+ protected String serverXml = null;
+ protected String properties = "";
+ protected String portRange = ""; // only used if port < 0, empty means whatever, can be "1024-65535"
public int getHttpPort() {
return httpPort;
@@ -106,25 +102,8 @@ public class TomEEConfiguration implemen
this.properties = properties;
}
- public Properties systemProperties() {
- if (properties == null || properties.isEmpty()) {
- return new Properties();
- }
-
- final Properties properties = new Properties();
- final ByteArrayInputStream bais = new ByteArrayInputStream(getProperties().getBytes());
- try {
- properties.load(bais);
- } catch (IOException e) {
- throw new OpenEJBRuntimeException(e);
- } finally {
- try {
- IO.close(bais);
- } catch (IOException ignored) {
- // no-op
- }
- }
- return properties;
+ public String systemProperties() {
+ return properties.replaceAll("\n *", "\n");
}
public String getPortRange() {
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java Thu Sep 13 19:53:37 2012
@@ -16,11 +16,16 @@
*/
package org.apache.openejb.arquillian.embedded;
+import org.apache.openejb.OpenEJBRuntimeException;
+import org.apache.openejb.arquillian.common.IO;
import org.apache.openejb.arquillian.common.Prefixes;
import org.apache.openejb.arquillian.common.TomEEConfiguration;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
/**
* @version $Rev$ $Date$
@@ -38,4 +43,25 @@ public class EmbeddedTomEEConfiguration
}
return toInts(value);
}
+
+ public Properties systemPropertiesAsProperties() {
+ if (properties == null || properties.isEmpty()) {
+ return new Properties();
+ }
+
+ final Properties properties = new Properties();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(getProperties().getBytes());
+ try {
+ properties.load(bais);
+ } catch (IOException e) {
+ throw new OpenEJBRuntimeException(e);
+ } finally {
+ try {
+ IO.close(bais);
+ } catch (IOException ignored) {
+ // no-op
+ }
+ }
+ return properties;
+ }
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Thu Sep 13 19:53:37 2012
@@ -77,7 +77,7 @@ public class EmbeddedTomEEContainer exte
configuration.setStopPort(tomeeConfiguration.getStopPort());
configuration.setHost(tomeeConfiguration.getHost());
configuration.setServerXml(tomeeConfiguration.getServerXml());
- configuration.setProperties(tomeeConfiguration.systemProperties());
+ configuration.setProperties(tomeeConfiguration.systemPropertiesAsProperties());
return configuration;
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/resources/arquillian.xml?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/src/test/resources/arquillian.xml Thu Sep 13 19:53:37 2012
@@ -22,11 +22,12 @@
<container qualifier="tomee-embedded" 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">
+ 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>
@@ -39,6 +40,8 @@
<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>
@@ -51,6 +54,8 @@
<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>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml Thu Sep 13 19:53:37 2012
@@ -22,11 +22,12 @@
<container qualifier="tomee-embedded" 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">
+ 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>
@@ -51,6 +52,8 @@
<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>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-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?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml Thu Sep 13 19:53:37 2012
@@ -22,11 +22,12 @@
<container qualifier="tomee-embedded" 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">
+ 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>
@@ -39,6 +40,8 @@
<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>
@@ -51,6 +54,8 @@
<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>
Added: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml?rev=1384495&view=auto
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml (added)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml Thu Sep 13 19:53:37 2012
@@ -0,0 +1,36 @@
+<?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-tomee-tests</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>arquillian-tomee-jms-tests</artifactId>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Tests :: JMS</name>
+
+ <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-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java (from r1382650, openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java&r1=1382650&r2=1384495&rev=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java Thu Sep 13 19:53:37 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests.jsf.jms;
+package org.apache.openejb.arquillian.tests.jms;
import javax.annotation.Resource;
import javax.faces.bean.ManagedBean;
@@ -25,13 +25,13 @@ import javax.jms.Topic;
@ManagedBean
public class DummyManagedBean {
@Resource
- Queue queue;
+ private Queue queue;
@Resource
- Topic topic;
+ private Topic topic;
@Resource
- ConnectionFactory connectionFactory;
+ private ConnectionFactory connectionFactory;
public String getFoo() {
if (queue != null) {
Propchange: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/DummyManagedBean.java
------------------------------------------------------------------------------
svn:executable = *
Copied: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java (from r1382650, openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java&r1=1382650&r2=1384495&rev=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java Thu Sep 13 19:53:37 2012
@@ -15,39 +15,52 @@
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests.jsf.jms;
+package org.apache.openejb.arquillian.tests.jms;
-import org.apache.openejb.arquillian.tests.jsf.JSFs;
import org.apache.openejb.loader.IO;
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.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptors;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.faces.webapp.FacesServlet;
import java.io.IOException;
import java.net.URL;
-import java.util.logging.Logger;
import static junit.framework.Assert.assertTrue;
@RunWith(Arquillian.class)
-public class JMSInjectionTest extends JSFs {
+public class JMSInjectionTest {
@ArquillianResource
private URL url;
- static Logger logger = Logger.getLogger(JMSInjectionTest.class.getName());
-
- @Deployment
+ @Deployment(testable = false)
public static WebArchive getArchive() {
- return base("jsf-jms-test.war")
+ return ShrinkWrap.create(WebArchive.class, "jsf-jms-test.war")
.addPackage(JMSInjectionTest.class.getPackage())
.addAsWebResource(new ClassLoaderAsset(
- JMSInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml");
+ JMSInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml")
+ .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class)
+ .version("3.0")
+ .createServlet()
+ .servletName("jsf")
+ .servletClass(FacesServlet.class.getName())
+ .loadOnStartup(1)
+ .up()
+ .createServletMapping()
+ .servletName("jsf")
+ .urlPattern("*.xhtml") // not the default
+ .up()
+ .exportAsString()));
}
@Test
Propchange: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSInjectionTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml (from r1382650, openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml&p1=openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml&r1=1382650&r2=1384495&rev=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml Thu Sep 13 19:53:37 2012
@@ -22,12 +22,15 @@
<container qualifier="tomee-embedded" 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.
+ Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false&broker.persistent=false
+ My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+
+ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.jms
</property>
</configuration>
</container>
@@ -39,7 +42,11 @@
<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
+ Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false&broker.persistent=false
+ My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+
+ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.jms
</property>
</configuration>
</container>
@@ -51,7 +58,11 @@
<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.
+ Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false&broker.persistent=false
+ My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+ My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
+
+ openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.jms
</property>
</configuration>
</container>
Propchange: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/org/apache/openejb/arquillian/tests/jms/dummy.xhtml
------------------------------------------------------------------------------
svn:executable = *
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java Thu Sep 13 19:53:37 2012
@@ -33,7 +33,6 @@ import org.junit.runner.RunWith;
import java.io.IOException;
import java.net.URL;
-import java.util.logging.Logger;
import static junit.framework.Assert.assertTrue;
@@ -43,22 +42,19 @@ public class JPAInjectionTest extends JS
@ArquillianResource
private URL url;
- static Logger logger=Logger.getLogger(JPAInjectionTest.class.getName());
-
- @Deployment
- public static WebArchive getArchive()
- {
- PersistenceDescriptor persistenceDescriptor= Descriptors.create(PersistenceDescriptor.class)
+ @Deployment(testable = false)
+ public static WebArchive getArchive() {
+ PersistenceDescriptor persistenceDescriptor = Descriptors.create(PersistenceDescriptor.class)
.createPersistenceUnit()
- .name("test-pu")
- .transactionType("JTA")
- .clazz(PersistenceDescriptor.class.getName())
- .jtaDataSource("test-ds")
+ .name("test-pu")
+ .transactionType("JTA")
+ .clazz(PersistenceDescriptor.class.getName())
+ .jtaDataSource("test-ds")
.up();
- Asset persistenceAsset=new StringAsset(persistenceDescriptor.exportAsString());
- return base("jsf-jpa-test.war").addAsManifestResource(persistenceAsset, "persistence.xml")
+ Asset persistenceAsset = new StringAsset(persistenceDescriptor.exportAsString());
+ return base("jsf-jpa-test.war").addAsWebInfResource(persistenceAsset, "persistence.xml")
.addPackage(JPAInjectionTest.class.getPackage())
.addAsWebResource(new ClassLoaderAsset(
JPAInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml");
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml Thu Sep 13 19:53:37 2012
@@ -22,12 +22,13 @@
<container qualifier="tomee-embedded" default="true">
<configuration>
<property name="httpPort">-1</property>
- <property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="dir">target/tomee-embedded</property>
<property name="appWorkingDir">target/arquillian-embedded-working-dir</property>
<property name="portRange">20001-30000</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>
@@ -42,6 +43,8 @@
<property name="portRange">20001-30000</property>
<property name="cleanOnStartUp">true</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>
@@ -55,6 +58,8 @@
<property name="appWorkingDir">target/arquillian-webapp-working-dir</property>
<property name="portRange">20001-30000</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>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Thu Sep 13 19:53:37 2012
@@ -26,6 +26,7 @@
<module>arquillian-tomee-webprofile-tests</module>
<module>arquillian-tomee-jaxrs-tests</module>
<module>arquillian-tomee-jaxws-tests</module>
+ <module>arquillian-tomee-jms-tests</module>
<module>arquillian-tomee-codi-tests</module>
</modules>
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1384495&r1=1384494&r2=1384495&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Thu Sep 13 19:53:37 2012
@@ -197,7 +197,11 @@ public class OpenEJBContextConfig extend
path = path.substring(0, path.length() - 1);
}
- return path + File.separator;
+ if (path.isEmpty()) {
+ return path;
+ }
+
+ return path + ".";
}
previous = current;