You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2014/03/11 17:09:59 UTC
svn commit: r1576402 [2/3] - in /tomee/tomee/branches/tomee-1.6.0.1: ./
arquillian/ arquillian/arquillian-common/
arquillian/arquillian-openejb-embedded-4/
arquillian/arquillian-openejb-transaction-provider/
arquillian/arquillian-tomee-common/ arquilli...
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/persistence-fragment/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/persistence-fragment/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/persistence-fragment/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/persistence-fragment/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/pojo-webservice/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/pojo-webservice/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/pojo-webservice/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/pojo-webservice/pom.xml Tue Mar 11 16:09:56 2014
@@ -25,7 +25,7 @@
<name>OpenEJB :: Web Examples :: Pojo WS</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>1.6.0</tomee.version>
+ <tomee.version>1.6.0.1-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
@@ -62,7 +62,7 @@
<plugin> <!-- http://localhost:8080/pojo-webservice?wsdl -->
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<configuration>
<tomeeVersion>${tomee.version}</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/polling-web/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/polling-web/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/polling-web/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/polling-web/pom.xml Tue Mar 11 16:09:56 2014
@@ -79,7 +79,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<configuration>
<tomeeClassifier>jaxrs</tomeeClassifier>
</configuration>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/polling-parent/pom.xml Tue Mar 11 16:09:56 2014
@@ -32,7 +32,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -41,7 +41,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>always</forkMode>
@@ -117,19 +117,19 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-embedded</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/projectstage-demo/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/projectstage-demo/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/projectstage-demo/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/projectstage-demo/pom.xml Tue Mar 11 16:09:56 2014
@@ -66,7 +66,7 @@
</dependencies>
<properties>
- <tomee.version>1.6.0</tomee.version>
+ <tomee.version>1.6.0.1-SNAPSHOT</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/realm-in-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/realm-in-tomee/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/realm-in-tomee/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/realm-in-tomee/pom.xml Tue Mar 11 16:09:56 2014
@@ -31,7 +31,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/reload-persistence-unit-properties/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/reload-persistence-unit-properties/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/reload-persistence-unit-properties/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/reload-persistence-unit-properties/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/resources-declared-in-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/resources-declared-in-webapp/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/resources-declared-in-webapp/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/resources-declared-in-webapp/pom.xml Tue Mar 11 16:09:56 2014
@@ -54,7 +54,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer-mockito/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer-mockito/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer-mockito/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer-mockito/pom.xml Tue Mar 11 16:09:56 2014
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/rest-applicationcomposer/pom.xml Tue Mar 11 16:09:56 2014
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example-with-application/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example-with-application/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example-with-application/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example-with-application/pom.xml Tue Mar 11 16:09:56 2014
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openejb.version>4.6.0</openejb.version>
- <tomee.version>1.6.0</tomee.version>
+ <tomee.version>1.6.0.1-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
@@ -52,7 +52,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/rest-example/pom.xml Tue Mar 11 16:09:56 2014
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openejb.version>4.6.0</openejb.version>
- <tomee.version>1.6.0</tomee.version>
+ <tomee.version>1.6.0.1-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<configuration>
<tomeeVersion>${tomee.version}</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
@@ -79,12 +79,12 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-embedded-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -168,7 +168,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/rest-jaas/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/rest-jaas/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/rest-jaas/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/rest-jaas/pom.xml Tue Mar 11 16:09:56 2014
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<configuration>
<systemVariables>
<java.security.auth.login.config>${project.build.directory}/apache-tomee/conf/login.config</java.security.auth.login.config>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/rest-on-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/rest-on-ejb/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/rest-on-ejb/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/rest-on-ejb/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/rest-xml-json/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/rest-xml-json/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/rest-xml-json/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/rest-xml-json/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/scala-basic/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/scala-basic/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/scala-basic/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/scala-basic/pom.xml Tue Mar 11 16:09:56 2014
@@ -68,7 +68,7 @@
<!-- disable surefire because we use scalatest -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<skipTests>true</skipTests>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-expression/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-expression/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-expression/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-expression/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods-meta/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods-meta/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods-meta/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/schedule-methods/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/server-events/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/server-events/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/server-events/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/server-events/pom.xml Tue Mar 11 16:09:56 2014
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-cdi-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-cdi-interceptor/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-cmp2/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-cmp2/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-cmp2/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-cmp2/pom.xml Tue Mar 11 16:09:56 2014
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -44,7 +44,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>pertest</forkMode>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-and-cdi/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-and-cdi/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-and-cdi/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-and-cdi/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-with-descriptor/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-with-descriptor/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb-with-descriptor/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-mdb/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-rest/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-rest/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-rest/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-rest/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful-callbacks/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful-callbacks/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful-callbacks/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful-callbacks/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateful/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-callbacks/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-callbacks/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-callbacks/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-callbacks/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-with-descriptor/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-with-descriptor/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless-with-descriptor/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-stateless/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice-without-interface/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice-without-interface/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice-without-interface/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice-without-interface/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/simple-webservice/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy-meta/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy-meta/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy-meta/pom.xml Tue Mar 11 16:09:56 2014
@@ -31,7 +31,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/spring-data-proxy/pom.xml Tue Mar 11 16:09:56 2014
@@ -31,7 +31,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/struts/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/struts/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/struts/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/struts/pom.xml Tue Mar 11 16:09:56 2014
@@ -37,12 +37,12 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/telephone-stateful/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/telephone-stateful/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/telephone-stateful/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/telephone-stateful/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testcase-injection/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testcase-injection/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testcase-injection/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testcase-injection/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-2/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-2/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-2/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-2/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -43,7 +43,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>pertest</forkMode>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-3/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-3/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-3/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-3/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -43,7 +43,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>pertest</forkMode>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-4/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-4/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-4/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-4/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -43,7 +43,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>pertest</forkMode>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-meta/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-meta/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security-meta/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -43,7 +43,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>pertest</forkMode>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testing-security/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -43,7 +43,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<forkMode>pertest</forkMode>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions-bmt/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions-bmt/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions-bmt/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions-bmt/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/testing-transactions/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/tomee-jersey-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/tomee-jersey-eclipselink/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/tomee-jersey-eclipselink/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/tomee-jersey-eclipselink/pom.xml Tue Mar 11 16:09:56 2014
@@ -87,7 +87,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<configuration>
<systemVariables>
<com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>true</com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-attachments/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-attachments/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-attachments/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-attachments/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-inheritance/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-inheritance/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-inheritance/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-security/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-security/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-security/pom.xml Tue Mar 11 16:09:56 2014
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-security/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-security/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-security/pom.xml Tue Mar 11 16:09:56 2014
@@ -82,7 +82,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-with-resources-config/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-with-resources-config/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-with-resources-config/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/examples/webservice-ws-with-resources-config/pom.xml Tue Mar 11 16:09:56 2014
@@ -53,7 +53,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
Modified: tomee/tomee/branches/tomee-1.6.0.1/itests/failover/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/itests/failover/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/itests/failover/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/itests/failover/pom.xml Tue Mar 11 16:09:56 2014
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-common</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/jarstxt-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/jarstxt-maven-plugin/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/jarstxt-maven-plugin/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/jarstxt-maven-plugin/pom.xml Tue Mar 11 16:09:56 2014
@@ -21,7 +21,7 @@ Licensed to the Apache Software Foundati
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/maven-util/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/maven-util/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/maven-util/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/maven-util/pom.xml Tue Mar 11 16:09:56 2014
@@ -22,7 +22,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/openejb-embedded-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/openejb-embedded-maven-plugin/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/openejb-embedded-maven-plugin/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/openejb-embedded-maven-plugin/pom.xml Tue Mar 11 16:09:56 2014
@@ -22,7 +22,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/pom.xml Tue Mar 11 16:09:56 2014
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<artifactId>maven</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: Maven Plugins</name>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-embedded-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-embedded-maven-plugin/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-embedded-maven-plugin/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-embedded-maven-plugin/pom.xml Tue Mar 11 16:09:56 2014
@@ -24,11 +24,11 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<artifactId>tomee-embedded-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>OpenEJB :: Maven Plugins :: TomEE Embedded Maven Plugin</name>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-maven-plugin/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-maven-plugin/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-maven-plugin/pom.xml Tue Mar 11 16:09:56 2014
@@ -24,11 +24,11 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>OpenEJB :: Maven Plugins :: TomEE Maven Plugin</name>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/pom.xml Tue Mar 11 16:09:56 2014
@@ -21,7 +21,7 @@ Licensed to the Apache Software Foundati
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml Tue Mar 11 16:09:56 2014
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -81,12 +81,12 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
</plugin>
<plugin>
@@ -100,7 +100,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<configuration>
<context>ROOT</context>
</configuration>
Modified: tomee/tomee/branches/tomee-1.6.0.1/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/pom.xml Tue Mar 11 16:09:56 2014
@@ -91,7 +91,7 @@
<properties>
<openejb.version>4.6.0</openejb.version>
- <tomee.version>1.6.0</tomee.version>
+ <tomee.version>1.6.0.1-SNAPSHOT</tomee.version>
<openjpa.version>2.3.0-nonfinal-1540826</openjpa.version>
<org.apache.openwebbeans.version>1.2.1</org.apache.openwebbeans.version>
@@ -121,7 +121,7 @@
<jaxb.version>2.2.6</jaxb.version>
- <tomcat.version>7.0.47</tomcat.version>
+ <tomcat.version>7.0.52</tomcat.version>
<!-- used mainly by jetty modules -->
<cxf.version>2.6.9</cxf.version>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tck/bval-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tck/bval-embedded/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tck/bval-embedded/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tck/bval-embedded/pom.xml Tue Mar 11 16:09:56 2014
@@ -85,7 +85,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<useFile>false</useFile>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tck/bval-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tck/bval-tomee/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tck/bval-tomee/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tck/bval-tomee/pom.xml Tue Mar 11 16:09:56 2014
@@ -66,7 +66,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<classifier>webprofile</classifier>
</dependency>
<dependency>
@@ -173,7 +173,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<useFile>false</useFile>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-embedded/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-embedded/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-embedded/pom.xml Tue Mar 11 16:09:56 2014
@@ -25,7 +25,7 @@
<artifactId>cdi-embedded</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TCK :: CDI Embedded</name>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee-embedded/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee-embedded/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee-embedded/pom.xml Tue Mar 11 16:09:56 2014
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tck/cdi-tomee/pom.xml Tue Mar 11 16:09:56 2014
@@ -58,7 +58,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<classifier>webprofile</classifier>
</dependency>
<dependency>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/apache-tomee/pom.xml Tue Mar 11 16:09:56 2014
@@ -22,7 +22,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-tomee</artifactId>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/pom.xml Tue Mar 11 16:09:56 2014
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee</artifactId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: TomEE</name>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/pom.xml?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/pom.xml Tue Mar 11 16:09:56 2014
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>1.6.0</version>
+ <version>1.6.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-catalina</artifactId>
Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Tue Mar 11 16:09:56 2014
@@ -21,6 +21,8 @@ import org.apache.catalina.loader.Webapp
import org.apache.openejb.OpenEJB;
import org.apache.openejb.classloader.ClassLoaderConfigurer;
import org.apache.openejb.classloader.WebAppEnricher;
+import org.apache.openejb.config.NewLoaderLogic;
+import org.apache.openejb.loader.Files;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -28,9 +30,16 @@ import org.apache.openejb.util.classload
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.Iterator;
public class LazyStopWebappClassLoader extends WebappClassLoader {
private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, LazyStopWebappClassLoader.class.getName());
@@ -41,19 +50,44 @@ public class LazyStopWebappClassLoader e
private boolean restarting = false;
private boolean forceStopPhase = Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.webappclassloader.force-stop-phase", "false"));
private ClassLoaderConfigurer configurer = null;
+ private final int hashCode;
+
+ // ugly but break the whole container in embedded mode at least, tomcat change had a lot of side effect
+ private void setj2seClassLoader(final ClassLoader loader) {
+ try {
+ final Field field = WebappClassLoader.class.getDeclaredField("j2seClassLoader");
+
+ if (!field.isAccessible()) {
+ field.setAccessible(true);
+ }
+
+ if (Modifier.isFinal(field.getModifiers())) {
+ final Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+ }
+
+ field.set(this, loader);
+ } catch (final Exception e) {
+ LOGGER.warning("Can't set field j2seClassLoader");
+ }
+ }
public LazyStopWebappClassLoader() {
- construct();
+ setj2seClassLoader(getSystemClassLoader());
+ hashCode = construct();
}
public LazyStopWebappClassLoader(final ClassLoader parent) {
super(parent);
- construct();
+ setj2seClassLoader(getSystemClassLoader());
+ hashCode = construct();
}
- private void construct() {
+ private int construct() {
setDelegate(isDelegate());
configurer = INIT_CONFIGURER.get();
+ return super.hashCode();
}
@Override
@@ -73,14 +107,14 @@ public class LazyStopWebappClassLoader e
|| "org.apache.tomee.mojarra.TomEEInjectionProvider".equals(name)) {
// don't load them from system classloader (breaks all in embedded mode and no sense in other cases)
synchronized (this) {
- final ClassLoader old = system;
- system = NoClassClassLoader.INSTANCE;
+ final ClassLoader old = j2seClassLoader;
+ setj2seClassLoader(NoClassClassLoader.INSTANCE);
final boolean delegate = getDelegate();
setDelegate(false);
try {
return super.loadClass(name);
} finally {
- system = old;
+ setj2seClassLoader(old);
setDelegate(delegate);
}
}
@@ -201,7 +235,31 @@ public class LazyStopWebappClassLoader e
}
@Override
+ public InputStream getResourceAsStream(final String name) {
+ if (!isStarted()) {
+ return null;
+ }
+ return super.getResourceAsStream(name);
+ }
+
+ @Override
public Enumeration<URL> getResources(final String name) throws IOException {
+ if (!isStarted()) {
+ return null;
+ }
+
+ if ("META-INF/services/javax.servlet.ServletContainerInitializer".equals(name)) {
+ final Collection<URL> list = new ArrayList<URL>(Collections.list(super.getResources(name)));
+ final Iterator<URL> it = list.iterator();
+ while (it.hasNext()) {
+ final URL next = it.next();
+ final File file = Files.toFile(next);
+ if (!file.isFile() && NewLoaderLogic.skip(next)) {
+ it.remove();
+ }
+ }
+ return Collections.enumeration(list);
+ }
return URLClassLoaderFirst.filterResources(name, super.getResources(name));
}
@@ -211,6 +269,11 @@ public class LazyStopWebappClassLoader e
}
@Override
+ public int hashCode() {
+ return hashCode;
+ }
+
+ @Override
public String toString() {
return "LazyStop" + super.toString();
}
Modified: tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1576402&r1=1576401&r2=1576402&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ tomee/tomee/branches/tomee-1.6.0.1/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Tue Mar 11 16:09:56 2014
@@ -60,6 +60,7 @@ import org.apache.tomee.loader.TomcatHel
import org.apache.xbean.finder.IAnnotationFinder;
import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServlet;
import javax.ws.rs.core.Application;
import java.io.ByteArrayInputStream;
@@ -408,10 +409,10 @@ public class OpenEJBContextConfig extend
}
@Override // called before processAnnotationsFile so using it as hook to init webInfClassesAnnotationsProcessed
- protected void processServletContainerInitializers(final Set<WebXml> fragments) {
+ protected void processServletContainerInitializers(final ServletContext ctx) {
webInfClassesAnnotationsProcessed = false;
try {
- super.processServletContainerInitializers(fragments);
+ super.processServletContainerInitializers(ctx);
if (typeInitializerMap.size() > 0 && finder != null) {
final ClassLoader loader = context.getLoader().getClassLoader();