Return-Path: 
 <commits-return-6979-apmail-felix-commits-archive=felix.apache.org@felix.apache.org>
Delivered-To: apmail-felix-commits-archive@www.apache.org
Received: (qmail 59801 invoked from network); 22 May 2009 16:01:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 22 May 2009 16:01:53 -0000
Received: (qmail 18844 invoked by uid 500); 22 May 2009 16:02:03 -0000
Delivered-To: apmail-felix-commits-archive@felix.apache.org
Received: (qmail 18809 invoked by uid 500); 22 May 2009 16:02:03 -0000
Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@felix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@felix.apache.org>
List-Post: <mailto:commits@felix.apache.org>
List-Id: <commits.felix.apache.org>
Reply-To: dev@felix.apache.org
Delivered-To: mailing list commits@felix.apache.org
Received: (qmail 18779 invoked by uid 99); 22 May 2009 16:02:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 May 2009 16:02:03 +0000
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; Fri, 22 May 2009 16:02:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 03FA52388873; Fri, 22 May 2009 16:01:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r777591 - in /felix/trunk/upnp: basedriver/
 basedriver/pom.xml
 pom.xml samples/binarylight/ samples/binarylight/pom.xml samples/clock/
 samples/clock/pom.xml samples/tv/ samples/tv/pom.xml tester/ tester/pom.xml
Date: Fri, 22 May 2009 16:01:40 -0000
To: commits@felix.apache.org
From: lenzi@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090522160141.03FA52388873@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: lenzi
Date: Fri May 22 16:01:40 2009
New Revision: 777591

URL: http://svn.apache.org/viewvc?rev=777591&view=rev
Log:
Added pax:run to all the upnp subproject
Removed automatic dependencies evaluation for upnp/pom.xml which caused multiple version of the same bundle to be installed


Modified:
    felix/trunk/upnp/basedriver/   (props changed)
    felix/trunk/upnp/basedriver/pom.xml
    felix/trunk/upnp/pom.xml
    felix/trunk/upnp/samples/binarylight/   (props changed)
    felix/trunk/upnp/samples/binarylight/pom.xml
    felix/trunk/upnp/samples/clock/   (props changed)
    felix/trunk/upnp/samples/clock/pom.xml
    felix/trunk/upnp/samples/tv/   (props changed)
    felix/trunk/upnp/samples/tv/pom.xml
    felix/trunk/upnp/tester/   (props changed)
    felix/trunk/upnp/tester/pom.xml

Propchange: felix/trunk/upnp/basedriver/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 16:01:40 2009
@@ -1,3 +1,4 @@
+runner
 classes
 target
 *.log

Modified: felix/trunk/upnp/basedriver/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/pom.xml?rev=777591&r1=777590&r2=777591&view=diff
==============================================================================
--- felix/trunk/upnp/basedriver/pom.xml (original)
+++ felix/trunk/upnp/basedriver/pom.xml Fri May 22 16:01:40 2009
@@ -157,24 +157,16 @@
 	  </execution>
 	</executions>
       </plugin>      
-      <!--plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>minijar-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-	<executions>
-	  <execution>
-	    <id>ueberjar</id>
-	    <phase>package</phase>
-	    <goals><goal>ueberjar</goal></goals>
-            <configuration>
-	      <stripUnusedClasses>true</stripUnusedClasses>
-	      <includeDependencies>
-	        <param>none:dependency</param>
-	      </includeDependencies>
-            </configuration>
-	  </execution>
-	</executions>
-      </plugin-->
+      <plugin>
+        <groupId>org.ops4j</groupId>
+        <artifactId>maven-pax-plugin</artifactId>
+        <configuration>
+          <provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver</provision>
+            <provision>mvn:org.apache.felix/javax.servlet</provision>
+          </provision>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Modified: felix/trunk/upnp/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/pom.xml?rev=777591&r1=777590&r2=777591&view=diff
==============================================================================
--- felix/trunk/upnp/pom.xml (original)
+++ felix/trunk/upnp/pom.xml Fri May 22 16:01:40 2009
@@ -67,6 +67,7 @@
         <groupId>org.ops4j</groupId>
         <artifactId>maven-pax-plugin</artifactId>
         <configuration>
+          <noDependencies>true</noDependencies>
           <provision>
             <provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
             <provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>

Propchange: felix/trunk/upnp/samples/binarylight/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 16:01:40 2009
@@ -1,3 +1,4 @@
+runner
 classes
 target
 *.log

Modified: felix/trunk/upnp/samples/binarylight/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/binarylight/pom.xml?rev=777591&r1=777590&r2=777591&view=diff
==============================================================================
--- felix/trunk/upnp/samples/binarylight/pom.xml (original)
+++ felix/trunk/upnp/samples/binarylight/pom.xml Fri May 22 16:01:40 2009
@@ -49,8 +49,22 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.ops4j</groupId>
+        <artifactId>maven-pax-plugin</artifactId>
+        <configuration>
+          <provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.extra</provision>
+            <provision>mvn:org.apache.felix/javax.servlet</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.http.jetty@nostart</provision>
+          </provision>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -73,7 +87,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.upnp.extra</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <version>0.4.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Propchange: felix/trunk/upnp/samples/clock/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 16:01:40 2009
@@ -1,3 +1,4 @@
+runner
 classes
 target
 *.log

Modified: felix/trunk/upnp/samples/clock/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/clock/pom.xml?rev=777591&r1=777590&r2=777591&view=diff
==============================================================================
--- felix/trunk/upnp/samples/clock/pom.xml (original)
+++ felix/trunk/upnp/samples/clock/pom.xml Fri May 22 16:01:40 2009
@@ -49,8 +49,22 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.ops4j</groupId>
+        <artifactId>maven-pax-plugin</artifactId>
+        <configuration>
+          <provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.extra</provision>
+            <provision>mvn:org.apache.felix/javax.servlet</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.http.jetty@nostart</provision>
+          </provision>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -67,7 +81,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.upnp.extra</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <version>0.4.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Propchange: felix/trunk/upnp/samples/tv/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 16:01:40 2009
@@ -1,3 +1,4 @@
+runner
 classes
 target
 *.log

Modified: felix/trunk/upnp/samples/tv/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/tv/pom.xml?rev=777591&r1=777590&r2=777591&view=diff
==============================================================================
--- felix/trunk/upnp/samples/tv/pom.xml (original)
+++ felix/trunk/upnp/samples/tv/pom.xml Fri May 22 16:01:40 2009
@@ -49,8 +49,22 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.ops4j</groupId>
+        <artifactId>maven-pax-plugin</artifactId>
+        <configuration>
+          <provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver@nostart</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.extra</provision>
+            <provision>mvn:org.apache.felix/javax.servlet</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.http.jetty@nostart</provision>
+          </provision>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -67,7 +81,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.upnp.extra</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <version>0.4.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Propchange: felix/trunk/upnp/tester/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 16:01:40 2009
@@ -1,3 +1,4 @@
+runner
 .checkstyle
 classes
 target

Modified: felix/trunk/upnp/tester/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/tester/pom.xml?rev=777591&r1=777590&r2=777591&view=diff
==============================================================================
--- felix/trunk/upnp/tester/pom.xml (original)
+++ felix/trunk/upnp/tester/pom.xml Fri May 22 16:01:40 2009
@@ -53,6 +53,17 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.ops4j</groupId>
+        <artifactId>maven-pax-plugin</artifactId>
+        <configuration>
+          <provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.basedriver/0.8.0@nostart</provision>
+            <provision>mvn:org.apache.felix/org.apache.felix.upnp.tester</provision>
+            <provision>mvn:org.apache.felix/javax.servlet</provision>
+          </provision>
+        </configuration>
+      </plugin>
     </plugins>
   </build>