Author: andygumbrecht
Date: Thu Jul 24 10:32:29 2014
New Revision: 1613064
URL: http://svn.apache.org/r1613064
Log:
Process resources required by tests before tests.
Fixed RemoteTomEEEJBContainerIT
Modified:
tomee/tomee/trunk/tomee/apache-tomee/pom.xml
tomee/tomee/trunk/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
Modified: tomee/tomee/trunk/tomee/apache-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/pom.xml?rev=1613064&r1=1613063&r2=1613064&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/pom.xml Thu Jul 24 10:32:29 2014
@@ -157,7 +157,7 @@
<executions>
<execution>
<id>filter-resources</id>
- <phase>prepare-package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>resources</goal>
</goals>
@@ -170,7 +170,7 @@
<executions>
<execution>
<id>copy-tomcat-for-webprofile</id>
- <phase>prepare-package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -189,7 +189,7 @@
</execution>
<execution>
<id>copy-tomcat-for-plus</id>
- <phase>prepare-package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -208,7 +208,7 @@
</execution>
<execution>
<id>copy-tomcat-for-plume</id>
- <phase>prepare-package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
Modified:
tomee/tomee/trunk/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java?rev=1613064&r1=1613063&r2=1613064&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
(original)
+++
tomee/tomee/trunk/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
Thu Jul 24 10:32:29 2014
@@ -42,14 +42,22 @@ public class RemoteTomEEEJBContainerIT {
writer.write("Hello");
writer.close();
- final File tomee = new
File("target/webprofile-work-dir/").listFiles(new FileFilter() {
+ File work = new File("target/webprofile-work-dir/").getAbsoluteFile();
+ if (!work.exists()) {
+ //May be running from root
+ work = new
File("apache-tomee/target/webprofile-work-dir/").getAbsoluteFile();
+ }
+
+ final File[] files = work.listFiles(new FileFilter() {
@Override
public boolean accept(final File pathname) {
return pathname.isDirectory() &&
pathname.getName().startsWith("apache-tomcat-");
}
- })[0];
+ });
+
+ final File tomee = (null != files ? files[0] : null);
if (tomee == null) {
- fail("tomee not built");
+ fail("Failed to find Tomcat directory required for this test -
Ensure you have run at least the maven phase: mvn process-resources");
}
final FileWriter serverXml = new FileWriter(new File(tomee,
"conf/server.xml"));
@@ -84,4 +92,4 @@ public class RemoteTomEEEJBContainerIT {
}
}
}
-}
+}
\ No newline at end of file
