Author: dblevins
Date: Sat Mar 16 22:49:19 2013
New Revision: 1457329
URL: http://svn.apache.org/r1457329
Log:
TOMEE-835 - Allow Arquillian config properties to be set via properties files
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
(with props)
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java
(with props)
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties
(with props)
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties
(with props)
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color-orange.properties
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color.properties
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties
(with props)
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
(with props)
Modified:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/pom.xml
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
Sat Mar 16 22:49:19 2013
@@ -0,0 +1,132 @@
+/*
+ * 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.
+ */
+package org.apache.openejb.arquillian.common;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConfigurationOverrides {
+ protected static final Logger LOGGER =
Logger.getLogger(TomEEContainer.class.getName());
+
+ public static void apply(Object configuration, final Properties
systemProperties, String... prefixes) {
+ final List<URL> urls = findPropertiesFiles(prefixes);
+
+ apply(configuration, systemProperties, urls, prefixes);
+ }
+
+ public static void apply(final Object configuration, final Properties
systemProperties, final List<URL> urls, final String... prefixes) {
+ final List<Properties> propertiesList = read(urls);
+
+ final Properties defaults = new Properties();
+
+ // Merge all the properties
+ for (Properties p : propertiesList) {
+ defaults.putAll(p);
+ }
+
+ final ObjectMap map = new ObjectMap(configuration);
+ for (Map.Entry<Object, Object> entry : defaults.entrySet()) {
+ final String key = entry.getKey().toString();
+ final String value = entry.getValue().toString();
+ setProperty(map, key, key, value, Level.FINE);
+ }
+
+ //
+ // Override the config with system properties
+ //
+ for (String key : map.keySet()) {
+ for (String prefix : prefixes) {
+ final String property = prefix + "." + key;
+ final String value = systemProperties.getProperty(property);
+
+ setProperty(map, key, property, value, Level.INFO);
+ }
+ }
+ }
+
+ private static List<Properties> read(List<URL> urls) {
+ final List<Properties> propertiesList = new ArrayList<Properties>();
+ for (URL url : urls) {
+ try {
+ propertiesList.add(IO.readProperties(url));
+ } catch (IOException e) {
+ LOGGER.log(Level.WARNING, "Cannot read : " + url, e);
+ }
+ }
+ return propertiesList;
+ }
+
+ public static List<URL> findPropertiesFiles(String... prefixes) {
+ final List<URL> urls = new ArrayList<URL>();
+
+ final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+
+ for (String prefix : prefixes) {
+ final String resourceName =
String.format("default.arquillian-%s.properties", prefix.replace('.', '-'));
+ addResources(urls, loader, resourceName);
+ }
+
+ for (String prefix : prefixes) {
+ final String resourceName =
String.format("arquillian-%s.properties", prefix.replace('.', '-'));
+ addResources(urls, loader, resourceName);
+ }
+ return urls;
+ }
+
+ private static void addResources(List<URL> urls, ClassLoader loader,
String resourceName) {
+ try {
+ final Enumeration<URL> resources =
loader.getResources(resourceName);
+ while (resources.hasMoreElements()) {
+ urls.add(resources.nextElement());
+ }
+ } catch (IOException e) {
+ LOGGER.log(Level.WARNING, "Failed getResources: " + resourceName,
e);
+ }
+ }
+
+ private static void setProperty(ObjectMap map, String key, String
property, String value, final Level info) {
+ if (value == null) {
+ LOGGER.log(Level.FINE, String.format("Unset '%s'", property));
+ return;
+ }
+
+ try {
+ LOGGER.log(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);
+ }
+ }
+ }
+ }
+}
Propchange:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1457329&r1=1457328&r2=1457329&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Sat Mar 16 22:49:19 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
//
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java
Sat Mar 16 22:49:19 2013
@@ -0,0 +1,150 @@
+/*
+ * 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.
+ */
+package org.apache.openejb.arquillian.common;
+
+import junit.framework.TestCase;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConfigurationOverridesTest extends TestCase {
+
+ /**
+ * This test is to guarantee the order that we find the related properties
+ * files. Changing the order would significantly change the logic.
+ *
+ * Do not change the order
+ *
+ * @throws Exception
+ */
+ public void testFindPropertiesFiles() throws Exception {
+ final List<URL> color =
ConfigurationOverrides.findPropertiesFiles("color", "color.orange");
+
+ assertEquals(4, color.size());
+
assertTrue(color.get(0).toExternalForm().endsWith("/default.arquillian-color.properties"));
+
assertTrue(color.get(1).toExternalForm().endsWith("/default.arquillian-color-orange.properties"));
+
assertTrue(color.get(2).toExternalForm().endsWith("/arquillian-color.properties"));
+
assertTrue(color.get(3).toExternalForm().endsWith("/arquillian-color-orange.properties"));
+ }
+
+ public void testApply() throws Exception {
+
+ {
+ final Color color = new Color();
+ ConfigurationOverrides.apply(color, new Properties(), "color");
+ assertEquals(240, color.red);
+ assertEquals(241, color.green);
+ assertEquals(255, color.blue);
+ assertEquals("1.0", color.alpha);
+ }
+
+ {
+ final Color color = new Color();
+ final Properties systemProperties = new Properties();
+ systemProperties.setProperty("color.green", "20");
+ systemProperties.setProperty("blue", "20"); // should have no
effect
+
+ ConfigurationOverrides.apply(color, systemProperties, "color");
+ assertEquals(240, color.red);
+ assertEquals(20, color.green);
+ assertEquals(255, color.blue);
+ assertEquals("1.0", color.alpha);
+ }
+
+ {
+ final Color color = new Color();
+ ConfigurationOverrides.apply(color, new Properties(), "color",
"color.orange");
+ assertEquals(240, color.red);
+ assertEquals(140, color.green);
+ assertEquals(0, color.blue);
+ assertEquals("1.0", color.alpha);
+ }
+
+ {
+ final Properties systemProperties = new Properties();
+ systemProperties.setProperty("color.blue", "1");
+ systemProperties.setProperty("red", "20"); // should have no effect
+
+ final Color color = new Color();
+
+ ConfigurationOverrides.apply(color, systemProperties, "color",
"color.orange");
+ assertEquals(240, color.red);
+ assertEquals(140, color.green);
+ assertEquals(1, color.blue);
+ assertEquals("1.0", color.alpha);
+ }
+
+ {
+ final Properties systemProperties = new Properties();
+ systemProperties.setProperty("color.blue", "1");
+ systemProperties.setProperty("color.orange.blue", "2");
+ systemProperties.setProperty("red", "20"); // should have no effect
+
+ final Color color = new Color();
+
+ ConfigurationOverrides.apply(color, systemProperties, "color",
"color.orange");
+ assertEquals(240, color.red);
+ assertEquals(140, color.green);
+ assertEquals(2, color.blue);
+ assertEquals("1.0", color.alpha);
+ }
+ }
+
+ public static class Color {
+
+ private int red;
+ private int green;
+ private int blue;
+ private String alpha;
+
+ public int getRed() {
+ return red;
+ }
+
+ public void setRed(int red) {
+ this.red = red;
+ }
+
+ public int getGreen() {
+ return green;
+ }
+
+ public void setGreen(int green) {
+ this.green = green;
+ }
+
+ public int getBlue() {
+ return blue;
+ }
+
+ public void setBlue(int blue) {
+ this.blue = blue;
+ }
+
+ public String getAlpha() {
+ return alpha;
+ }
+
+ public void setAlpha(String alpha) {
+ this.alpha = alpha;
+ }
+ }
+}
Propchange:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/ConfigurationOverridesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties
Sat Mar 16 22:49:19 2013
@@ -0,0 +1 @@
+green=140
Propchange:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color-orange.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties
Sat Mar 16 22:49:19 2013
@@ -0,0 +1,3 @@
+red=240
+green=241
+
Propchange:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/arquillian-color.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color-orange.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color-orange.properties?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color-orange.properties
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color-orange.properties
Sat Mar 16 22:49:19 2013
@@ -0,0 +1,2 @@
+green=165
+blue=0
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color.properties?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color.properties
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-common/src/test/resources/default.arquillian-color.properties
Sat Mar 16 22:49:19 2013
@@ -0,0 +1,4 @@
+red=255
+green=255
+blue=255
+alpha=1.0
Modified:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/pom.xml?rev=1457329&r1=1457328&r2=1457329&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/pom.xml
(original)
+++ tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/pom.xml
Sat Mar 16 22:49:19 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/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1457329&r1=1457328&r2=1457329&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
(original)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
Sat Mar 16 22:49:19 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;
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties
Sat Mar 16 22:49:19 2013
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+ajpPort=8009
+artifactId=apache-tomee
+classifier=webprofile
+cleanOnStartUp=false
+debugPort=5005
+exportConfAsSystemProperty=false
+groupId=${pom.groupId}
+host=localhost
+httpPort=8080
+stopHost=localhost
+stopPort=8005
+type=zip
+version=${pom.version}
Propchange:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1457329&r1=1457328&r2=1457329&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
Sat Mar 16 22:49:19 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/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1457329&r1=1457328&r2=1457329&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
Sat Mar 16 22:49:19 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>
Added:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties?rev=1457329&view=auto
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
(added)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
Sat Mar 16 22:49:19 2013
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+artifactId = tomee-webapp
+type = war
+removeUnusedWebapps = true
+useInstallerServlet = false
+version=${pom.version}
+groupId=${pom.groupId}
Propchange:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml?rev=1457329&r1=1457328&r2=1457329&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/branches/tomee-1.5.x/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
Sat Mar 16 22:49:19 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">
