Return-Path: 
 <sling-commits-return-4154-apmail-incubator-sling-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org
Received: (qmail 75783 invoked from network); 2 Dec 2008 17:32:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Dec 2008 17:32:17 -0000
Received: (qmail 36005 invoked by uid 500); 2 Dec 2008 17:32:29 -0000
Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org
Received: (qmail 35967 invoked by uid 500); 2 Dec 2008 17:32:28 -0000
Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:sling-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:sling-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:sling-commits@incubator.apache.org>
List-Id: <sling-commits.incubator.apache.org>
Reply-To: sling-dev@incubator.apache.org
Delivered-To: mailing list sling-commits@incubator.apache.org
Received: (qmail 35958 invoked by uid 99); 2 Dec 2008 17:32:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2008 09:32:28 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2008 17:31:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 41B6023888A6; Tue,  2 Dec 2008 09:31:56 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r722535 -
 /incubator/sling/trunk/launchpad/testing/pom.xml
Date: Tue, 02 Dec 2008 17:31:55 -0000
To: sling-commits@incubator.apache.org
From: bdelacretaz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081202173156.41B6023888A6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bdelacretaz
Date: Tue Dec  2 09:31:54 2008
New Revision: 722535

URL: http://svn.apache.org/viewvc?rev=722535&view=rev
Log:
SLING-751 - adapt bundle folder names to new conventions

Modified:
    incubator/sling/trunk/launchpad/testing/pom.xml

Modified: incubator/sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/pom.xml?rev=722535&r1=722534&r2=722535&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/launchpad/testing/pom.xml Tue Dec  2 09:31:54 2008
@@ -144,14 +144,17 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <!-- Copy bundles that must be initially installed to WEB-INF/resources/bundles -->
+                        <!-- 
+                        	Copy bundles that must be initially installed to WEB-INF/resources/N
+                        	where N = desired start level 
+                        -->
                         <id>copy-bundles-dependencies</id>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
                             <outputDirectory>
-                                ${project.build.directory}/${project.build.finalName}/WEB-INF/resources/bundles
+                                ${project.build.directory}/${project.build.finalName}/WEB-INF/resources/20
                             </outputDirectory>
                             <excludeTransitive>true</excludeTransitive>
                             <includeGroupIds>
@@ -192,21 +195,21 @@
                                     org/apache/sling/launcher/app/main/**
                                 </exclude>
                                 <exclude>
-                                    resources/bundles/org.apache.sling**
+                                    resources/*/org.apache.sling**
                                 </exclude>
                                 <exclude>
-                                    resources/bundles/org.apache.felix.http.jetty*.jar
+                                    resources/*/org.apache.felix.http.jetty*.jar
                                 </exclude>
                                 <exclude>
-                                    resources/bundles/pax-web-service*.jar
+                                    resources/*/pax-web-service*.jar
                                 </exclude>
                                 <exclude>
-                                    resources/bundles/org.apache.felix.commons.servlet-api*.jar
+                                    resources/*/org.apache.felix.commons.servlet-api*.jar
                                 </exclude>
                             </excludes>
                             <includes>
                                 <include>org/**</include>
-                                <include>resources/bundles/org.apache.felix**</include>
+                                <include>resources/*/org.apache.felix**</include>
                             </includes>
                         </resource>
                         <!-- the configuration resources, but no Sling bundles -->
@@ -223,19 +226,19 @@
                             </includes>
                             <excludes>
                                 <exclude>
-                                    resources/bundles/org.apache.sling**
+                                    resources/*/org.apache.sling**
                                 </exclude>
                                 <exclude>
                                     resources/corebundles/org.apache.sling**
                                 </exclude>
                                 <exclude>
-                                    resources/bundles/org.apache.felix.http.jetty*.jar
+                                    resources/*/org.apache.felix.http.jetty*.jar
                                 </exclude>
                                 <exclude>
-                                    resources/bundles/pax-web-service*.jar
+                                    resources/*/pax-web-service*.jar
                                 </exclude>
                                 <exclude>
-                                    resources/bundles/org.apache.felix.commons.servlet-api*.jar
+                                    resources/*/org.apache.felix.commons.servlet-api*.jar
                                 </exclude>
                             </excludes>
                         </resource>