You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/02/13 05:40:00 UTC
svn commit: r1243414 - in /openejb/trunk/openejb/arquillian-tomee:
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-remote/ arquillian-tomee-tests/
arquillian-tomee-tests/src/test/resources/ arquillian-tomee-...
Author: dblevins
Date: Mon Feb 13 04:40:00 2012
New Revision: 1243414
URL: http://svn.apache.org/viewvc?rev=1243414&view=rev
Log:
Fixed overriding bug. Added profiles for all our arquillian adapters to the tests bucket
TOMEE-127, TOME-136, TOMEE-137
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java?rev=1243414&r1=1243413&r2=1243414&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java Mon Feb 13 04:40:00 2012
@@ -55,7 +55,7 @@ public class ObjectMap extends AbstractM
for (Method getter : clazz.getMethods()) {
try {
- if (getter.getName().startsWith("get")) continue;
+ if (!getter.getName().startsWith("get")) continue;
if (getter.getParameterTypes().length != 0) continue;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1243414&r1=1243413&r2=1243414&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Mon Feb 13 04:40:00 2012
@@ -61,19 +61,22 @@ public abstract class TomEEContainer<Con
this.configuration = configuration;
final Prefixes prefixes = configuration.getClass().getAnnotation(Prefixes.class);
+
if (prefixes == null) return;
final ObjectMap map = new ObjectMap(configuration);
-
for (String key : map.keySet()) {
for (String prefix : prefixes.value()) {
final String property = prefix + "." + key;
final String value = System.getProperty(property);
- if (value == null) continue;
+ if (value == null) {
+ LOGGER.log(Level.FINE, String.format("Unset '%s'", property));
+ continue;
+ }
try {
- LOGGER.log(Level.FINE, String.format("Applying override '%s=%s'", property, value));
+ LOGGER.log(Level.INFO, String.format("Applying override '%s=%s'", property, value));
map.put(key, value);
} catch (Exception e) {
LOGGER.log(Level.WARNING, String.format("Override failed '%s=%s'", property, value), e);
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml?rev=1243414&r1=1243413&r2=1243414&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml Mon Feb 13 04:40:00 2012
@@ -76,6 +76,7 @@
<type>zip</type>
<version>1.0.0-beta-3-SNAPSHOT</version>
<classifier>webprofile</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml?rev=1243414&r1=1243413&r2=1243414&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml Mon Feb 13 04:40:00 2012
@@ -157,7 +157,7 @@
<profiles>
<profile>
- <id>arquillian-tomee-embedded</id>
+ <id>tomee-embedded</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -171,13 +171,168 @@
</profile>
<profile>
- <id>arquillian-tomee-remote</id>
+ <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>${project.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>${project.version}</version>
+ <classifier>webprofile</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ <scope>compile</scope>
+ </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>${project.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>${project.version}</version>
+ <classifier>plus</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ <scope>compile</scope>
+ </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>4.0.0-beta-3-SNAPSHOT</tomee.version>
+ <tomee.tomcatVersion>7.0.21</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-webapp</artifactId>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomcat</artifactId>
+ <version>7.0.21</version>
+ <type>zip</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ <scope>compile</scope>
+ </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>4.0.0-beta-3-SNAPSHOT</tomee.version>
+ <tomee.tomcatVersion>7.0.21</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>4.0.0-beta-3-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomcat</artifactId>
+ <version>7.0.21</version>
+ <type>zip</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</profile>
@@ -199,12 +354,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>${version.arquillian}</version>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml?rev=1243414&r1=1243413&r2=1243414&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml Mon Feb 13 04:40:00 2012
@@ -25,8 +25,6 @@
<property name="dir">/tmp/arquillian-apache-tomee</property>
<property name="httpPort">11080</property>
<property name="stopPort">11005</property>
- <property name="tomcatVersion"></property>
- <property name="openejbVersion">1.0.0-beta-2-SNAPSHOT</property>
</configuration>
</container>
</arquillian>
\ No newline at end of file
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java?rev=1243414&r1=1243413&r2=1243414&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java Mon Feb 13 04:40:00 2012
@@ -25,7 +25,7 @@ import org.apache.openejb.arquillian.com
@Prefixes({"tomee", "tomee.webapp"})
public class TomEEWebappConfiguration extends TomEEConfiguration {
- private String tomcatVersion = null;
+ private String tomcatVersion = "7.0.21";
private String groupId = "org.apache.openejb";
private String artifactId = "tomee-webapp";
private String version = "1.0.0-beta-3-SNAPSHOT";
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java?rev=1243414&r1=1243413&r2=1243414&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java Mon Feb 13 04:40:00 2012
@@ -181,12 +181,6 @@ public class TomEEWebappContainer extend
}
}
- public void connect(int port) throws Exception {
- Socket socket = new Socket("localhost", port);
- OutputStream out = socket.getOutputStream();
- out.close();
- }
-
public Class<TomEEWebappConfiguration> getConfigurationClass() {
return TomEEWebappConfiguration.class;
}