You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/01/28 08:49:47 UTC
svn commit: r615748 - in /incubator/sling/trunk: launcher/app/pom.xml
launchpad/launchpad-webapp/pom.xml
Author: cziegeler
Date: Sun Jan 27 23:49:37 2008
New Revision: 615748
URL: http://svn.apache.org/viewvc?rev=615748&view=rev
Log:
RESOLVED - issue SLING-205: launcher/app and launchpad/launchpad-webapp delete 'sling' directory when invoking from sling-builder
https://issues.apache.org/jira/browse/SLING-205
Modified:
incubator/sling/trunk/launcher/app/pom.xml
incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml
Modified: incubator/sling/trunk/launcher/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/app/pom.xml?rev=615748&r1=615747&r2=615748&view=diff
==============================================================================
--- incubator/sling/trunk/launcher/app/pom.xml (original)
+++ incubator/sling/trunk/launcher/app/pom.xml Sun Jan 27 23:49:37 2008
@@ -52,21 +52,20 @@
<build>
<plugins>
- <!--
<plugin>
-
+ <!--
The clean plugin deletes the sling work directory as well,
to avoid confusion with leftovers from previous runs
+ -->
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
- <directory>sling</directory>
+ <directory>${basedir}/sling</directory>
</fileset>
</filesets>
</configuration>
</plugin>
- -->
<!-- Bundles to list in the installer properties file -->
<plugin>
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml?rev=615748&r1=615747&r2=615748&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml Sun Jan 27 23:49:37 2008
@@ -71,21 +71,6 @@
<plugins>
<plugin>
- <!--
- The clean plugin deletes the sling work directory as well,
- to avoid confusion with leftovers from previous runs
- -->
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>sling</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.5</version>
@@ -288,6 +273,9 @@
<container>
<containerId>jetty6x</containerId>
<type>embedded</type>
+ <systemProperties>
+ <sling.home>${basedir}/target/it/sling</sling.home>
+ </systemProperties>
</container>
<properties>
<cargo.jvmargs>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=30333,server=y,suspend=y</cargo.jvmargs>