Author: fmeschbe
Date: Sat Jan 10 10:52:28 2009
New Revision: 733313
URL: http://svn.apache.org/viewvc?rev=733313&view=rev
Log:
SLING-817 Launchpad/base contains all classes, app and webapp only
add bundles to be installed
Modified:
incubator/sling/trunk/launchpad/app/pom.xml
incubator/sling/trunk/launchpad/base/pom.xml
incubator/sling/trunk/launchpad/webapp/pom.xml
Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=733313&r1=733312&r2=733313&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Sat Jan 10 10:52:28 2009
@@ -145,43 +145,18 @@
</execution>
<execution>
- <id>inline-osgi-bundles</id>
+ <id>inline-launchpad-base</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>
- org.osgi.core,org.osgi.compendium,servlet-api
+ org.apache.sling.launchpad.base
</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory>
${project.build.outputDirectory}
</outputDirectory>
- <includes>**</includes>
- <excludes>
- org/osgi/framework/**,
- org/osgi/service/packageadmin/**,
- org/osgi/service/startlevel/**,
- org/osgi/service/url/**,
- org/osgi/util/tracker/**, META-INF/**
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>inline-framework-bundles</id>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeArtifactIds>
-
org.apache.felix.framework,org.apache.sling.launchpad.base
- </includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- <outputDirectory>
- ${project.build.outputDirectory}
- </outputDirectory>
- <includes>**</includes>
- <excludes>META-INF/**,**/NOTICE</excludes>
</configuration>
</execution>
</executions>
@@ -230,37 +205,6 @@
</reporting>
<dependencies>
- <!--
- Core Felix Archives bundled with the application, making up the
- application Classpath. These can only be updated by updating the
- application.
-
- These dependencies are marked as provided because they should
- not be inherited transitively as the sling-app library contains
- them.
- -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>1.0.4</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
Modified: incubator/sling/trunk/launchpad/base/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/pom.xml?rev=733313&r1=733312&r2=733313&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/pom.xml (original)
+++ incubator/sling/trunk/launchpad/base/pom.xml Sat Jan 10 10:52:28 2009
@@ -42,6 +42,58 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/base</developerConnection>
<url>http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base</url>
</scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>inline-osgi-bundles</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>
+
org.osgi.core,org.osgi.compendium,servlet-api,servlet
+ </includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>
+ ${project.build.outputDirectory}
+ </outputDirectory>
+ <includes>**</includes>
+ <excludes>
+ org/osgi/framework/**,
+ org/osgi/service/packageadmin/**,
+ org/osgi/service/startlevel/**,
+ org/osgi/service/url/**,
+ org/osgi/util/tracker/**, META-INF/**
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>inline-framework-bundles</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>
+ org.apache.felix.framework
+ </includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>
+ ${project.build.outputDirectory}
+ </outputDirectory>
+ <includes>**</includes>
+ <excludes>META-INF/**,**/NOTICE</excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<reporting>
<plugins>
<plugin>
@@ -70,11 +122,13 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>1.0.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.equinox.http</groupId>
Modified: incubator/sling/trunk/launchpad/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/pom.xml?rev=733313&r1=733312&r2=733313&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/webapp/pom.xml Sat Jan 10 10:52:28 2009
@@ -119,7 +119,7 @@
</goals>
<configuration>
<includeArtifactIds>
- org.apache.sling.launchpad.app,servlet
+ org.apache.sling.launchpad.app
</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory>
@@ -131,30 +131,6 @@
</overWriteSnapshots>
</configuration>
</execution>
- <execution>
- <!-- Copy bundles that must be initially installed to
WEB-INF/resources/bundles -->
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>
-
${project.build.directory}/${project.build.finalName}/WEB-INF/resources/0
- </outputDirectory>
- <excludeTransitive>true</excludeTransitive>
- <includeGroupIds>
-
org.apache.felix,org.apache.sling,org.apache.jackrabbit
- </includeGroupIds>
- <excludeArtifactIds>
- <!-- the app bundle is not needed, we only
depend on it to get the same dependencies,
- same is try for the base bundle -->
-
org.apache.sling.launchpad.app,org.apache.sling.launchpad.base
- </excludeArtifactIds>
- <includeScope>
- provided
- </includeScope>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -174,18 +150,10 @@
<exclude>
org/apache/sling/launcher/app/main/**
</exclude>
- <exclude>
-
resources/5/org.apache.felix.http.jetty*.jar
- </exclude>
- <exclude>
- resources/5/pax-web-service*.jar
- </exclude>
- <exclude>
-
resources/5/org.apache.felix.commons.servlet-api*.jar
- </exclude>
</excludes>
<includes>
<include>org/**</include>
+ <include>info/**</include>
</includes>
</resource>
<!-- the configuration resources -->
@@ -202,13 +170,10 @@
</includes>
<excludes>
<exclude>
-
resources/5/org.apache.felix.http.jetty*.jar
- </exclude>
- <exclude>
- resources/5/pax-web-service*.jar
+
resources/*/org.apache.felix.http.jetty*.jar
</exclude>
<exclude>
-
resources/5/org.apache.felix.commons.servlet-api*.jar
+ resources/*/pax-web-service*.jar
</exclude>
</excludes>
</resource>
@@ -269,18 +234,5 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.equinox.http</groupId>
- <artifactId>servlet</artifactId>
- <version>1.0.0-v20070606</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
</dependencies>
</project>
