You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/02/18 09:50:03 UTC

svn commit: r628648 - /incubator/sling/trunk/launcher/app/pom.xml

Author: fmeschbe
Date: Mon Feb 18 00:50:02 2008
New Revision: 628648

URL: http://svn.apache.org/viewvc?rev=628648&view=rev
Log:
Separate inclusion of OSGi and Felix Framework libraries to control overwrite of
OSGi classes by Felix Framework classes.

Modified:
    incubator/sling/trunk/launcher/app/pom.xml

Modified: incubator/sling/trunk/launcher/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/app/pom.xml?rev=628648&r1=628647&r2=628648&view=diff
==============================================================================
--- incubator/sling/trunk/launcher/app/pom.xml (original)
+++ incubator/sling/trunk/launcher/app/pom.xml Mon Feb 18 00:50:02 2008
@@ -104,18 +104,43 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>inline-osgi-bundles</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeArtifactIds>
+                                org.osgi.core,org.osgi.compendium
+                            </includeArtifactIds>
+                            <excludeTransitive>true</excludeTransitive>
+                            <outputDirectory>
+                                ${project.build.outputDirectory}
+                            </outputDirectory>
+                            <include>**</include>
+                            <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.osgi.core,org.osgi.compendium
+                                org.apache.felix.framework
                             </includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
                             <outputDirectory>
                                 ${project.build.outputDirectory}
                             </outputDirectory>
+                            <include>**</include>
                             <excludes>META-INF/**</excludes>
                         </configuration>
                     </execution>