Author: rmannibucau
Date: Tue Aug 6 09:16:33 2013
New Revision: 1510890
URL: http://svn.apache.org/r1510890
Log:
TOMEE-1015 updating to arquillian 1.1.1.Final to get multiline support in
arquillian.xml
Removed:
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/PatchConfigurationExtension.java
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/PatchConfigurationRegistar.java
tomee/tomee/trunk/arquillian/arquillian-common/src/main/resources/META-INF/services/
Modified:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
tomee/tomee/trunk/arquillian/pom.xml
Modified:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java?rev=1510890&r1=1510889&r2=1510890&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
Tue Aug 6 09:16:33 2013
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.arquillian.openejb;
+import org.jboss.arquillian.config.descriptor.api.Multiline;
import org.jboss.arquillian.container.spi.ConfigurationException;
import
org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
@@ -31,6 +32,7 @@ public class OpenEJBConfiguration implem
return properties;
}
+ @Multiline
public void setProperties(String properties) {
this.properties = properties;
}
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1510890&r1=1510889&r2=1510890&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
Tue Aug 6 09:16:33 2013
@@ -17,6 +17,7 @@
package org.apache.openejb.arquillian.common;
+import org.jboss.arquillian.config.descriptor.api.Multiline;
import org.jboss.arquillian.container.spi.ConfigurationException;
import
org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
@@ -34,11 +35,12 @@ public class TomEEConfiguration implemen
protected String stopHost = "localhost"; // generally localhost but host
(http) can be different
protected String stopCommand = "SHUTDOWN"; // default one - can be
overriden in server.xml
protected String serverXml = null;
- protected String properties = "";
protected String portRange = ""; // only used if port < 0, empty means
whatever, can be "1024-65535"
protected boolean quickSession = true;
protected boolean unpackWars = true;
+ protected String properties = "";
+
public boolean isUnpackWars() {
return unpackWars;
}
@@ -110,6 +112,7 @@ public class TomEEConfiguration implemen
return properties;
}
+ @Multiline
public void setProperties(String properties) {
this.properties = properties;
}
Modified: tomee/tomee/trunk/arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/pom.xml?rev=1510890&r1=1510889&r2=1510890&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/pom.xml Tue Aug 6 09:16:33 2013
@@ -32,7 +32,7 @@
<name>OpenEJB :: Arquillian Adaptors Parent</name>
<properties>
- <version.arquillian>1.0.4.Final</version.arquillian>
+ <version.arquillian>1.1.1.Final</version.arquillian>
<version.shrinkwrap.descriptor>2.0.0-alpha-5</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.1.2</version.shrinkwrap.shrinkwrap>
</properties>
