Author: fmeschbe
Date: Sat Mar 12 12:12:57 2011
New Revision: 1080925
URL: http://svn.apache.org/viewvc?rev=1080925&view=rev
Log:
- Adapt to using remote resources
- Remove unused dist profile
- Remove unused (and broken) dist assembly.xml
Added:
sling/trunk/launchpad/builder/src/main/appended-resources/
sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/
sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/NOTICE
(with props)
Removed:
sling/trunk/launchpad/builder/LICENSE
sling/trunk/launchpad/builder/NOTICE
sling/trunk/launchpad/builder/assembly.xml
Modified:
sling/trunk/launchpad/builder/pom.xml
sling/trunk/launchpad/builder/src/main/assembly/bin.xml
Modified: sling/trunk/launchpad/builder/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1080925&r1=1080924&r2=1080925&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/pom.xml (original)
+++ sling/trunk/launchpad/builder/pom.xml Sat Mar 12 12:12:57 2011
@@ -153,13 +153,7 @@
<resources>
<!-- Legal stuff -->
<resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>DISCLAIMER</include>
- </includes>
+
<directory>${project.build.directory}/maven-shared-archive-resources</directory>
</resource>
</resources>
</configuration>
@@ -237,7 +231,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
-
<packagingExcludes>WEB-INF/classes/resources/**</packagingExcludes>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>
+ true
+ </addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+
<packagingExcludes>WEB-INF/classes/resources/**,WEB-INF/classes/META-INF/**</packagingExcludes>
<webResources>
<!-- the configuration resources -->
<resource>
@@ -246,16 +247,12 @@
</directory>
<targetPath>WEB-INF</targetPath>
</resource>
- <!-- Legal stuff -->
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
+ <!-- ensure the legalize stuff is in the war -->
+ <webResource>
+ <targetPath />
+ <filtering>false</filtering>
+
<directory>${project.build.directory}/maven-shared-archive-resources</directory>
+ </webResource>
</webResources>
</configuration>
</plugin>
@@ -312,38 +309,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>dist</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemble-distribution</id>
- <configuration>
- <descriptors>
- <descriptor>
- assembly.xml
- </descriptor>
- </descriptors>
- <appendAssemblyId>
- false
- </appendAssemblyId>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<repositories>
<repository>
<id>OPS4J</id>
Added: sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/NOTICE?rev=1080925&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/NOTICE
(added)
+++ sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/NOTICE
Sat Mar 12 12:12:57 2011
@@ -0,0 +1,2 @@
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
Propchange:
sling/trunk/launchpad/builder/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: sling/trunk/launchpad/builder/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/assembly/bin.xml?rev=1080925&r1=1080924&r2=1080925&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/assembly/bin.xml (original)
+++ sling/trunk/launchpad/builder/src/main/assembly/bin.xml Sat Mar 12 12:12:57
2011
@@ -30,19 +30,14 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/META-INF</directory>
+
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory></outputDirectory>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>DISCLAIMER</include>
- </includes>
</fileSet>
<fileSet>
<directory>target</directory>
<outputDirectory></outputDirectory>
<includes>
- <include>*.jar</include>
+ <include>*-standalone.jar</include>
<include>*.war</include>
</includes>
</fileSet>
