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 14:42:00 UTC
svn commit: r1694484 - in /jackrabbit/oak/trunk/oak-examples/webapp: pom.xml
src/test/resources/compatibility.zip src/test/resources/logging.properties
Author: chetanm
Date: Thu Aug 6 12:42:00 2015
New Revision: 1694484
URL: http://svn.apache.org/r1694484
Log:
OAK-3185 - Port and refactor jackrabbit-webapp module to Oak (WIP)
-- Remove the compatibility.zip as thats related to JR2
-- Update Jetty plugin to latest
-- Configure failsafe plugin - Somehow without explicit config failsafe plugin is not getting executed
-- Add oak-pojosr dependency
-- Add explicit dependency to commons-io:2.4 - Somehow due to transitive pull commons-io:1.4 is getting used with which Oak does not work. So Adding explicit dependency
Added:
jackrabbit/oak/trunk/oak-examples/webapp/src/test/resources/logging.properties (with props)
Removed:
jackrabbit/oak/trunk/oak-examples/webapp/src/test/resources/compatibility.zip
Modified:
jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
Modified: jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/pom.xml?rev=1694484&r1=1694483&r2=1694484&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/pom.xml Thu Aug 6 12:42:00 2015
@@ -27,10 +27,11 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
<version>1.4-SNAPSHOT</version>
+ <relativePath>../../oak-parent/pom.xml</relativePath>
</parent>
<artifactId>oak-webapp</artifactId>
<packaging>war</packaging>
- <name>Oak Web Application</name>
+ <name>Oak Web Application Example</name>
<description>Web application that hosts and serves a Jackrabbit Oak content repository</description>
<properties>
@@ -38,7 +39,6 @@
<jackrabbit.version>2.10.1</jackrabbit.version>
<tomcat.version>7.0.40</tomcat.version>
<tika.version>1.7</tika.version>
- <jetty.version>6.1.22</jetty.version>
</properties>
<dependencies>
@@ -48,6 +48,11 @@
<version>2.0</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>${tika.version}</version>
@@ -84,6 +89,11 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-pojosr</artifactId>
+ <version>${oak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-lucene</artifactId>
<version>${oak.version}</version>
</dependency>
@@ -149,9 +159,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.2.8.v20150217</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
@@ -211,6 +221,47 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>oak</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>
+ src/test/resources/logging.properties
+ </java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>failsafe-integration-tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>failsafe-verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: jackrabbit/oak/trunk/oak-examples/webapp/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/src/test/resources/logging.properties?rev=1694484&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/src/test/resources/logging.properties (added)
+++ jackrabbit/oak/trunk/oak-examples/webapp/src/test/resources/logging.properties Thu Aug 6 12:42:00 2015
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
Propchange: jackrabbit/oak/trunk/oak-examples/webapp/src/test/resources/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native