You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/08/06 12:41:13 UTC
svn commit: r1694446 - in /jackrabbit/oak/trunk/oak-webapp: pom.xml
src/main/java/org/apache/jackrabbit/j2ee/DerbyShutdown.java
src/main/webapp/WEB-INF/web.xml
src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java
Author: chetanm
Date: Thu Aug 6 10:41:12 2015
New Revision: 1694446
URL: http://svn.apache.org/r1694446
Log:
OAK-3185 - Port and refactor jackrabbit-webapp module to Oak (WIP)
-- Change the ant task to work with new artifactId name
-- Remove derby related code and config
-- Remove BackwardsCompatibilityIT - Not related to Oak
Removed:
jackrabbit/oak/trunk/oak-webapp/src/main/java/org/apache/jackrabbit/j2ee/DerbyShutdown.java
jackrabbit/oak/trunk/oak-webapp/src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java
Modified:
jackrabbit/oak/trunk/oak-webapp/pom.xml
jackrabbit/oak/trunk/oak-webapp/src/main/webapp/WEB-INF/web.xml
Modified: jackrabbit/oak/trunk/oak-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-webapp/pom.xml?rev=1694446&r1=1694445&r2=1694446&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-webapp/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-webapp/pom.xml Thu Aug 6 10:41:12 2015
@@ -166,7 +166,7 @@
<phase>package</phase>
<configuration>
<target>
- <jar basedir="${project.build.outputDirectory}" destfile="${project.build.directory}/jackrabbit-webapp-${project.version}.jar" />
+ <jar basedir="${project.build.outputDirectory}" destfile="${project.build.directory}/oak-webapp-${project.version}.jar" />
</target>
</configuration>
<goals>
@@ -189,7 +189,7 @@
<configuration>
<artifacts>
<artifact>
- <file>${project.build.directory}/jackrabbit-webapp-${project.version}.jar</file>
+ <file>${project.build.directory}/oak-webapp-${project.version}.jar</file>
<type>jar</type>
</artifact>
</artifacts>
@@ -207,21 +207,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/BackwardsCompatibilityIT.java</exclude> <!-- JCR-3640 -->
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
Modified: jackrabbit/oak/trunk/oak-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-webapp/src/main/webapp/WEB-INF/web.xml?rev=1694446&r1=1694445&r2=1694446&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ jackrabbit/oak/trunk/oak-webapp/src/main/webapp/WEB-INF/web.xml Thu Aug 6 10:41:12 2015
@@ -20,14 +20,6 @@
<web-app>
<display-name>Jackrabbit JCR Server</display-name>
- <listener>
- <!-- Releases all Derby resources when the webapp is undeployed. -->
- <!-- See https://issues.apache.org/jira/browse/JCR-1301 -->
- <listener-class>
- org.apache.jackrabbit.j2ee.DerbyShutdown
- </listener-class>
- </listener>
-
<!-- ====================================================================== -->
<!-- R E P O S I T O R Y S T A R T U P S E R V L E T -->
<!-- ====================================================================== -->