Skip to content

Instantly share code, notes, and snippets.

@rmannibucau

rmannibucau/gist:2309687

Created April 5, 2012 10:05
Show Gist options
  • Save rmannibucau/2309687 to your computer and use it in GitHub Desktop.
Save rmannibucau/2309687 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Index: container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (révision 1309375)
+++ container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (copie de travail)
@@ -1512,7 +1512,7 @@
return ResourcesModule.class;
}
- if (descriptors.containsKey("application.xml") || path.endsWith(".ear")) {
+ if (descriptors.containsKey("application.xml") || path.endsWith(".ear")) {
return AppModule.class;
}
Index: pom.xml
===================================================================
--- pom.xml (révision 1309396)
+++ pom.xml (copie de travail)
@@ -115,7 +115,7 @@
<javaee-api.version>6.0-3</javaee-api.version>
<!-- Used mainly in assembly/openejb-tomcat* projects -->
- <tomcat.version>7.0.21</tomcat.version>
+ <tomcat.version>7.0.27</tomcat.version>
<!-- used mainly by jetty modules -->
<openejb-cxf.version>2.5.2-SNAPSHOT</openejb-cxf.version>
Index: arquillian-tomee/arquillian-tomee-tests/pom.xml
===================================================================
--- arquillian-tomee/arquillian-tomee-tests/pom.xml (révision 1309375)
+++ arquillian-tomee/arquillian-tomee-tests/pom.xml (copie de travail)
@@ -253,7 +253,7 @@
<systemPropertyVariables>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
<tomee.version>4.0.0-beta-3-SNAPSHOT</tomee.version>
- <tomee.tomcatVersion>7.0.21</tomee.tomcatVersion>
+ <tomee.tomcatVersion>7.0.27</tomee.tomcatVersion>
</systemPropertyVariables>
<excludes>
<exclude>**/jaxrs/**</exclude>
@@ -278,7 +278,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-tomcat</artifactId>
- <version>7.0.21</version>
+ <version>7.0.27</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
@@ -302,7 +302,7 @@
<systemPropertyVariables>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
<tomee.version>4.0.0-beta-3-SNAPSHOT</tomee.version>
- <tomee.tomcatVersion>7.0.21</tomee.tomcatVersion>
+ <tomee.tomcatVersion>7.0.27</tomee.tomcatVersion>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -323,7 +323,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-tomcat</artifactId>
- <version>7.0.21</version>
+ <version>7.0.27</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
Index: arquillian-tomee/pom.xml
===================================================================
--- arquillian-tomee/pom.xml (révision 1309375)
+++ arquillian-tomee/pom.xml (copie de travail)
@@ -36,7 +36,6 @@
<version.arquillian>1.0.0.CR5</version.arquillian>
<version.cdi-api>1.0</version.cdi-api>
<version.openejb>4.0.0-beta-3-SNAPSHOT</version.openejb>
- <version.org.apache.tomcat>7.0.21</version.org.apache.tomcat>
<version.tomee>1.0.0-beta-3-SNAPSHOT</version.tomee>
<version.shrinkwrap.descriptor>1.1.0-beta-1</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.0.0-beta-6</version.shrinkwrap.shrinkwrap>
Index: arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
===================================================================
--- arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml (révision 1309375)
+++ arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml (copie de travail)
@@ -25,7 +25,7 @@
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
- <property name="tomcatVersion">7.0.21</property>
+ <property name="tomcatVersion">7.0.27</property>
<property name="version">4.0.0-beta-3-SNAPSHOT</property>
<property name="dir">target/apache-tomee-remote</property>
<property name="appWorkingDir">target/arquillian-test-working-dir</property>
Index: arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
===================================================================
--- arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java (révision 1309375)
+++ arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java (copie de travail)
@@ -25,7 +25,7 @@
@Prefixes({"tomee", "tomee.webapp"})
public class TomEEWebappConfiguration extends TomEEConfiguration {
- private String tomcatVersion = "7.0.21";
+ 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";
Index: arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
===================================================================
--- arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml (révision 1309375)
+++ arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml (copie de travail)
@@ -66,19 +66,19 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${version.org.apache.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>${version.org.apache.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>${version.org.apache.tomcat}</version>
+ <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jdt.core.compiler</groupId>
Index: arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
===================================================================
--- arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java (révision 1309375)
+++ arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java (copie de travail)
@@ -85,8 +85,8 @@
}
public static void main(String[] args) {
- // File file = new MavenCache().getArtifact("org.apache.openejb:tomcat:zip:6.0.33", "http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.21/bin/apache-tomcat-7.0.21.zip").getFile();
- File file = new MavenCache().getArtifact("org.apache.openejb:apache-tomee:1.0.0-beta-2-SNAPSHOT:zip:plus", "http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.21/bin/apache-tomcat-7.0.21.zip");
+ // File file = new MavenCache().getArtifact("org.apache.openejb:tomcat:zip:6.0.33", "http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.zip").getFile();
+ File file = new MavenCache().getArtifact("org.apache.openejb:apache-tomee:1.0.0-beta-2-SNAPSHOT:zip:plus", "http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.zip");
System.out.println(file.getAbsolutePath());
}
}
Index: examples/webapps/rest-example-with-application/pom.xml
===================================================================
--- examples/webapps/rest-example-with-application/pom.xml (révision 1309375)
+++ examples/webapps/rest-example-with-application/pom.xml (copie de travail)
@@ -72,7 +72,7 @@
<configuration>
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
- <tomcatVersion>7.0.21</tomcatVersion>
+ <tomcatVersion>7.0.27</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Index: examples/webapps/rest-example/pom.xml
===================================================================
--- examples/webapps/rest-example/pom.xml (révision 1309396)
+++ examples/webapps/rest-example/pom.xml (copie de travail)
@@ -81,7 +81,7 @@
<configuration>
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
- <tomcatVersion>7.0.21</tomcatVersion>
+ <tomcatVersion>7.0.27</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Index: examples/webapps/moviefun/app/pom.xml
===================================================================
--- examples/webapps/moviefun/app/pom.xml (révision 1309375)
+++ examples/webapps/moviefun/app/pom.xml (copie de travail)
@@ -150,7 +150,7 @@
<configuration>
<tomcatHttpPort>9999</tomcatHttpPort>
<tomcatShutdownPort>9998</tomcatShutdownPort>
- <tomcatVersion>7.0.21</tomcatVersion>
+ <tomcatVersion>7.0.27</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Index: examples/webapps/resources-declared-in-webapp/pom.xml
===================================================================
--- examples/webapps/resources-declared-in-webapp/pom.xml (révision 1309375)
+++ examples/webapps/resources-declared-in-webapp/pom.xml (copie de travail)
@@ -75,7 +75,7 @@
<configuration>
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
- <tomcatVersion>7.0.21</tomcatVersion>
+ <tomcatVersion>7.0.27</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Index: examples/webapps/ejb-examples/pom.xml
===================================================================
--- examples/webapps/ejb-examples/pom.xml (révision 1309375)
+++ examples/webapps/ejb-examples/pom.xml (copie de travail)
@@ -60,7 +60,7 @@
<configuration>
<tomcatHttpPort>9999</tomcatHttpPort>
<tomcatShutdownPort>9998</tomcatShutdownPort>
- <tomcatVersion>7.0.21</tomcatVersion>
+ <tomcatVersion>7.0.27</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment