Author: dblevins Date: Sat Mar 16 23:24:56 2013 New Revision: 1457342 URL: http://svn.apache.org/r1457342 Log: svn merge -r 1457328:1457329 https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.x
http://svn.apache.org/viewvc?view=revision&revision=1457329 ------------------------------------------------------------------------ r1457329 | dblevins | 2013-03-16 15:49:19 -0700 (Sat, 16 Mar 2013) | 2 lines TOMEE-835 - Allow Arquillian config properties to be set via properties files ------------------------------------------------------------------------ Added: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/java/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/java/org/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/java/org/apache/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/resources/ - copied from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color-orange.properties - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color-orange.properties tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color.properties - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color.properties tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties - copied unchanged from r1457329, tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1457342&r1=1457341&r2=1457342&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Sat Mar 16 23:24:56 2013 @@ -80,41 +80,13 @@ public abstract class TomEEContainer<Con if (prefixes == null) return; - // - // Override the config with system properties - // - 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) { - LOGGER.log(Level.FINE, String.format("Unset '%s'", property)); - continue; - } - - try { - LOGGER.log(Level.INFO, String.format("Applying override '%s=%s'", property, value)); - map.put(key, value); - } catch (Exception e) { - try { - map.put(key, Integer.parseInt(value)); // we manage String and int and boolean so let's try an int - } catch (Exception ignored) { - try { - map.put(key, Boolean.parseBoolean(value)); // idem let's try a boolean - } catch (Exception ignored2) { - LOGGER.log(Level.WARNING, String.format("Override failed '%s=%s'", property, value), e); - } - } - } - } - } + ConfigurationOverrides.apply(configuration, System.getProperties(), prefixes.value()); setPorts(); // with multiple containers we don't want it so let the user eb able to skip it if (configuration.getExportConfAsSystemProperty()) { + final ObjectMap map = new ObjectMap(configuration); // // Export the config back out to properties // Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml?rev=1457342&r1=1457341&r2=1457342&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml Sat Mar 16 23:24:56 2013 @@ -140,6 +140,12 @@ </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <testResources> <testResource> <directory>${project.basedir}/src/test/resources</directory> Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1457342&r1=1457341&r2=1457342&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java Sat Mar 16 23:24:56 2013 @@ -28,11 +28,11 @@ import java.util.List; @Prefixes({"tomee", "tomee.remote"}) public class RemoteTomEEConfiguration extends TomEEConfiguration { - private String groupId = "org.apache.openejb"; - private String artifactId = "apache-tomee"; - private String version = "LATEST"; - private String classifier = "webprofile"; - private String type = "zip"; + private String groupId; + private String artifactId; + private String version; + private String classifier; + private String type; private boolean removeUnusedWebapps = true; private int ajpPort = 8009; private String conf; Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1457342&r1=1457341&r2=1457342&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml Sat Mar 16 23:24:56 2013 @@ -25,7 +25,6 @@ <property name="httpPort">-1</property> <property name="stopPort">-1</property> <property name="ajpPort">-1</property> - <property name="version">${tomee.version}</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> <property name="properties"> Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1457342&r1=1457341&r2=1457342&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Sat Mar 16 23:24:56 2013 @@ -277,6 +277,12 @@ </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <testResources> <testResource> <directory>${project.basedir}/src/test/resources</directory> Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml?rev=1457342&r1=1457341&r2=1457342&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml (original) +++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml Sat Mar 16 23:24:56 2013 @@ -30,7 +30,6 @@ <property name="stopPort">-1</property> <property name="tomcatVersion">${tomcat.version}</property> <property name="useInstallerServlet">true</property> - <property name="version">${tomee.version}</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> <property name="properties">
