Author: jgallimore
Date: Mon May 23 22:06:40 2011
New Revision: 1126779
URL: http://svn.apache.org/viewvc?rev=1126779&view=rev
Log:
OPENEJB-1556 fix some compile errors, build from clean m2 repo, pick up
openejb.war from lib directory
Removed:
openejb/trunk/sandbox/arquillian-tomee/openejb-webapp-wrapper/
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/pom.xml
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
openejb/trunk/sandbox/arquillian-tomee/pom.xml
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/pom.xml?rev=1126779&r1=1126778&r2=1126779&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/pom.xml
(original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/pom.xml
Mon May 23 22:06:40 2011
@@ -36,9 +36,16 @@
<version.org.apache.tomcat>7.0.12</version.org.apache.tomcat>
<version.cdi-api>1.0</version.cdi-api>
<version.arquillian>1.0.0-SNAPSHOT</version.arquillian>
- <version.shrinkwrap>SW140-SNAPSHOT</version.shrinkwrap>
</properties>
-
+
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
@@ -48,12 +55,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-extension-tomcat-6</artifactId>
- <version>${version.shrinkwrap}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<version>${version.arquillian}</version>
@@ -123,18 +124,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>${version.shrinkwrap}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-webapp-wrapper</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>3.5.1</version>
@@ -169,4 +158,36 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-tomcat-webapp</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>lib</outputDirectory>
+ <destFileName>openejb.war</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java?rev=1126779&r1=1126778&r2=1126779&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
Mon May 23 22:06:40 2011
@@ -25,7 +25,7 @@ public class TomEEConfiguration implemen
private int stopPort = 8005;
private String stopCommand = "SHUTDOWN";
private String dir = System.getProperty("java.io.tmpdir") +
"/arquillian-apache-tomee";
- private String openejbPath =
"classpath:/openejb-tomcat-webapp-4.0.0-SNAPSHOT.war";
+ private String openejbPath = "lib/openejb.war";
private int timeout = 30;
public int getHttpPort() {
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java?rev=1126779&r1=1126778&r2=1126779&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-container/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
Mon May 23 22:06:40 2011
@@ -256,7 +256,7 @@ public class TomEEContainer implements D
usingOpenEJB = true;
try {
if (openejbPath.startsWith("classpath:/")) {
- URL resource =
TomEEContainerTest.class.getResource(openejbPath.substring(10));
+ URL resource =
TomEEContainer.class.getResource(openejbPath.substring(10));
copyStream(resource.openStream(), new
FileOutputStream(new File(directory, "webapps/openejb.war")));
} else {
FileInputStream is = new
FileInputStream(new File(openejbPath));
Modified: openejb/trunk/sandbox/arquillian-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/pom.xml?rev=1126779&r1=1126778&r2=1126779&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/pom.xml (original)
+++ openejb/trunk/sandbox/arquillian-tomee/pom.xml Mon May 23 22:06:40 2011
@@ -27,11 +27,18 @@
<name>arquillian-tomee</name>
<url>http://openejb.apache.org</url>
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ </repositories>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
- <module>openejb-webapp-wrapper</module>
<module>arquillian-tomee-container</module>
</modules>
</project>
\ No newline at end of file
