You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/11/28 11:34:57 UTC
svn commit: r721417 - in /jackrabbit/branches/1.5: ./
jackrabbit-standalone/pom.xml
jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
Author: jukka
Date: Fri Nov 28 02:34:56 2008
New Revision: 721417
URL: http://svn.apache.org/viewvc?rev=721417&view=rev
Log:
1.5: Merged revisions 720524 and 720673 (JCR-1357)
Modified:
jackrabbit/branches/1.5/ (props changed)
jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml
jackrabbit/branches/1.5/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 28 02:34:56 2008
@@ -1,2 +1,2 @@
/jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720492,720533
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720492,720524,720533,720540,720673
Modified: jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml?rev=721417&r1=721416&r2=721417&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml Fri Nov 28 02:34:56 2008
@@ -39,13 +39,36 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.jackrabbit.standalone.Main</mainClass>
+ </manifest>
+ </archive>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <excludes>
+ LICENSE*, NOTICE*, META-INF/LICENSE*, META-INF/NOTICE*,
+ license, license/**/*, test, test/**/*,
+ WEB-INF/lib, WEB-INF/lib/**/*,
+ WEB-INF/classes, WEB-INF/classes/**/*
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -54,6 +77,7 @@
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>1.0</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -62,6 +86,12 @@
<type>war</type>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.11</version>
@@ -71,11 +101,6 @@
<artifactId>jsp-2.1</artifactId>
<version>6.1.11</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.3.0</version>
- </dependency>
</dependencies>
</project>
Modified: jackrabbit/branches/1.5/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=721417&r1=721416&r2=721417&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java Fri Nov 28 02:34:56 2008
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.standalone;
import java.io.File;
+import java.net.URL;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.webapp.WebAppContext;
@@ -30,17 +31,21 @@
* @param args
*/
public static void main(String[] argv) throws Exception {
+ URL location =
+ Main.class.getProtectionDomain().getCodeSource().getLocation();
+
File jackrabbit = new File("jackrabbit");
jackrabbit.mkdirs();
WebAppContext webapp = new WebAppContext();
webapp.setContextPath("/");
- webapp.setWar("target/jackrabbit-standalone-SNAPSHOT-jar-with-dependencies.jar");
+ webapp.setWar(location.toString());
webapp.setExtractWAR(false);
webapp.setTempDirectory(new File(jackrabbit, "jetty"));
- Server server = new Server(8080);
+ Server server = new Server(1234);
server.setHandler(webapp);
+ server.setStopAtShutdown(true);
server.start();
server.join();
}