Author: rmannibucau
Date: Wed Mar 20 11:28:33 2013
New Revision: 1458768
URL: http://svn.apache.org/r1458768
Log:
ensuring we use the correct version of tomee-webapp
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
tomee/tomee/trunk/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/ConfigurationOverrides.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java?rev=1458768&r1=1458767&r2=1458768&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
Wed Mar 20 11:28:33 2013
@@ -34,10 +34,14 @@ public class ConfigurationOverrides {
public static List<URL> apply(Object configuration, final Properties
systemProperties, String... prefixes) {
final List<URL> propertiesFiles =
findPropertiesFiles("default.arquillian-%s.properties", prefixes);
- apply(configuration, systemProperties, propertiesFiles, false,
prefixes);
+ if (!propertiesFiles.isEmpty()) {
+ apply(configuration, systemProperties, propertiesFiles, false,
prefixes);
+ }
final List<URL> overridePropFiles =
findPropertiesFiles("arquillian-%s.properties", prefixes);
- apply(configuration, systemProperties, overridePropFiles, true,
prefixes);
+ if (!overridePropFiles.isEmpty()) {
+ apply(configuration, systemProperties, overridePropFiles, true,
prefixes);
+ }
propertiesFiles.addAll(overridePropFiles);
return propertiesFiles;
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java?rev=1458768&r1=1458767&r2=1458768&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
Wed Mar 20 11:28:33 2013
@@ -18,7 +18,6 @@ package org.apache.tomee.arquillian.weba
import org.apache.openejb.arquillian.common.Prefixes;
import org.apache.openejb.arquillian.common.TomEEConfiguration;
-import org.apache.openejb.resolver.maven.VersionResolver;
import java.util.ArrayList;
import java.util.List;
@@ -30,13 +29,12 @@ import java.util.List;
public class TomEEWebappConfiguration extends TomEEConfiguration {
private static final String TOMCAT_REFERENCE_ARTIFACT =
"org.apache.tomcat:tomcat-catalina";
private static final String TOMCAT_VERSION_PREFIX = "7.";
- private static final String DEFAULT_TOMCAT_VERSION = TOMCAT_VERSION_PREFIX
+ "0.29";
- private String tomcatVersion = null;
- private String groupId = "org.apache.openejb";
- private String artifactId = "tomee-webapp";
- private String version = "LATEST";
- private String type = "war";
+ private String tomcatVersion;
+ private String groupId;
+ private String artifactId;
+ private String version; // let the version be set from properties file
otherwise latest will be 4.0.0
+ private String type;
private boolean removeUnusedWebapps = true;
private boolean useInstallerServlet = false;
private int ajpPort = 8009;
@@ -88,9 +86,6 @@ public class TomEEWebappConfiguration ex
}
public String getTomcatVersion() {
- if (tomcatVersion == null || "LATEST".equals(tomcatVersion)) {
- tomcatVersion =
VersionResolver.highestVersion(TOMCAT_REFERENCE_ARTIFACT,
TOMCAT_VERSION_PREFIX, DEFAULT_TOMCAT_VERSION);
- }
return tomcatVersion;
}
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties?rev=1458768&r1=1458767&r2=1458768&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
Wed Mar 20 11:28:33 2013
@@ -20,3 +20,4 @@ removeUnusedWebapps = true
useInstallerServlet = false
version=${pom.version}
groupId=${pom.groupId}
+tomcatVersion=${tomcat.version}
