Author: rmannibucau
Date: Tue May 29 09:48:14 2012
New Revision: 1343633
URL: http://svn.apache.org/viewvc?rev=1343633&view=rev
Log:
a bunch of version were still in beta-3
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.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/test/resources/arquillian.xml
openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
openejb/trunk/openejb/tomee/build.xml
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
Tue May 29 09:48:14 2012
@@ -29,10 +29,17 @@
<properties>
<version.selenium>2.7.0</version.selenium>
<version.selenium.rc>2.0rc2</version.selenium.rc>
+ <tomee.version>1.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
<finalName>moviefun</finalName>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
@@ -188,7 +195,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<type>jar</type>
<!--<classifier>uber</classifier>-->
<scope>test</scope>
@@ -224,7 +231,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-embedded</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -235,7 +242,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
Tue May 29 09:48:14 2012
@@ -25,7 +25,7 @@
<property name="httpPort">9080</property>
<property name="stopPort">9005</property>
<property name="tomcatVersion"></property>
- <property name="openejbVersion">1.0.0-beta-2-SNAPSHOT</property>
+ <property name="openejbVersion">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
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=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml Tue
May 29 09:48:14 2012
@@ -137,6 +137,12 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
Tue May 29 09:48:14 2012
@@ -27,7 +27,7 @@ public class RemoteTomEEConfiguration ex
private String groupId = "org.apache.openejb";
private String artifactId = "apache-tomee";
- private String version = "1.0.0-beta-3-SNAPSHOT";
+ private String version = "1.1.0-SNAPSHOT";
private String classifier = "webprofile";
private String type = "zip";
private boolean removeUnusedWebapps = true;
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
Tue May 29 09:48:14 2012
@@ -25,7 +25,7 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="ajpPort">-1</property>
- <property name="version">1.0.0-beta-3-SNAPSHOT</property>
+ <property name="version">${version.tomee}</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
Tue May 29 09:48:14 2012
@@ -293,6 +293,12 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
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=1343633&r1=1343632&r2=1343633&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
Tue May 29 09:48:14 2012
@@ -28,7 +28,7 @@ public class TomEEWebappConfiguration ex
private String tomcatVersion = "7.0.27";
private String groupId = "org.apache.openejb";
private String artifactId = "tomee-webapp";
- private String version = "1.0.0-beta-3-SNAPSHOT";
+ private String version = "1.1.0-SNAPSHOT";
private String type = "war";
private boolean removeUnusedWebapps = true;
private int ajpPort = 8009;
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
Tue May 29 09:48:14 2012
@@ -29,7 +29,7 @@
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="tomcatVersion">7.0.27</property>
- <property name="version">4.0.0-beta-3-SNAPSHOT</property>
+ <property name="version">${version.tomee}</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
Modified: openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml (original)
+++ openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml Tue May 29
09:48:14 2012
@@ -27,9 +27,16 @@
<name>OpenEJB :: Examples :: Multiple TomEE with Arquillian</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.version>1.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -85,7 +92,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
Tue May 29 09:48:14 2012
@@ -23,7 +23,7 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="ajpPort">-1</property>
- <property name="version">1.0.0-beta-3-SNAPSHOT</property>
+ <property name="version">${1.1.0-SNAPSHOT}</property>
<property name="dir">target/apache-tomee-remote-1</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir-1</property>
</configuration>
@@ -33,7 +33,7 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="ajpPort">-1</property>
- <property name="version">1.0.0-beta-3-SNAPSHOT</property>
+ <property name="version">${1.1.0-SNAPSHOT}</property>
<property name="dir">target/apache-tomee-remote-2</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir-2</property>
</configuration>
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
Tue May 29 09:48:14 2012
@@ -70,7 +70,7 @@ public class ReconnectDelayCaseInsensiti
public void test() throws Exception {
// To run in an IDE, uncomment and update this line
- System.setProperty("version", "4.0.0-beta-3-SNAPSHOT");
+ System.setProperty("version", "4.1.0-SNAPSHOT");
Duration reconnectDelay = new Duration("1 second");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
Tue May 29 09:48:14 2012
@@ -70,7 +70,7 @@ public class ReconnectDelayListSelfTest
public void test() throws Exception {
// To run in an IDE, uncomment and update this line
- System.setProperty("version", "4.0.0-beta-3-SNAPSHOT");
+ System.setProperty("version", "4.1.0-SNAPSHOT");
Duration reconnectDelay = new Duration("1 second");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
Tue May 29 09:48:14 2012
@@ -52,7 +52,7 @@ public class ReconnectDelayTest {
public void test() throws Exception {
// To run in an IDE, uncomment and update this line
- System.setProperty("version", "4.0.0-beta-3-SNAPSHOT");
+ System.setProperty("version", "4.1.0-SNAPSHOT");
Duration reconnectDelay = new Duration("1 second");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
Tue May 29 09:48:14 2012
@@ -69,7 +69,7 @@ public class StickyConnectionStrategyTes
public void test() throws Exception {
// To run in an IDE, uncomment and update this line
- System.setProperty("version", "4.0.0-beta-3-SNAPSHOT");
+ System.setProperty("version", "4.1.0-SNAPSHOT");
final File zip = Repository.getArtifact("org.apache.openejb",
"openejb-standalone", "zip");
final File app = Repository.getArtifact("org.apache.openejb.itests",
"failover-ejb", "jar");
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Tue May 29 09:48:14 2012
@@ -82,7 +82,7 @@ public abstract class AbstractTomEEMojo
protected List<ArtifactRepository> remoteRepos;
/**
- * @parameter expression="${tomee-plugin.version}"
default-value="1.0.0-beta-3-SNAPSHOT"
+ * @parameter expression="${tomee-plugin.version}"
default-value="1.1.0-SNAPSHOT"
*/
protected String tomeeVersion;
Modified: openejb/trunk/openejb/tomee/build.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/build.xml?rev=1343633&r1=1343632&r2=1343633&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/build.xml (original)
+++ openejb/trunk/openejb/tomee/build.xml Tue May 29 09:48:14 2012
@@ -19,7 +19,7 @@
<project name="dev-helper" default="copy_static">
<target name="copy_static">
- <copy verbose="true"
todir="apache-tomee/target/apache-tomee-webprofile-1.0.0-beta-3-SNAPSHOT/webapps/tomee/staging">
+ <copy verbose="true"
todir="apache-tomee/target/apache-tomee-webprofile-1.1.0-SNAPSHOT/webapps/tomee/staging">
<fileset dir="tomee-webapp/src/main/webapp/staging" includes="**"/>
</copy>
</target>
