[Ipojo-toolbox-commits] SF.net SVN: ipojo-toolbox:[63] trunk/runtime/felix

[<bou...@us...>]

Revision: 63
          http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=63&view=rev
Author:   bourretp
Date:     2009-04-18 17:42:11 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
iPOJO Felix runtime :
* Now including the newly released 1.0.0 version of the Apache Felix HTTP Service.
- Removed previous old http-jetty snapshot bundle.

Modified Paths:
--------------
    trunk/runtime/felix/assembly.xml
    trunk/runtime/felix/config.properties
    trunk/runtime/felix/pom.xml

Removed Paths:
-------------
    trunk/runtime/felix/lib/

Modified: trunk/runtime/felix/assembly.xml
===================================================================
--- trunk/runtime/felix/assembly.xml	2009-04-15 07:36:23 UTC (rev 62)
+++ trunk/runtime/felix/assembly.xml	2009-04-18 17:42:11 UTC (rev 63)
@@ -31,7 +31,6 @@
       <excludes>
 		<exclude>pom.xml</exclude>
 		<exclude>assembly.xml</exclude>
-		<exclude>lib/**</exclude>
 		<exclude>target/**</exclude>
 		<exclude>felix-cache/**</exclude>
       </excludes>

Modified: trunk/runtime/felix/config.properties
===================================================================
--- trunk/runtime/felix/config.properties	2009-04-15 07:36:23 UTC (rev 62)
+++ trunk/runtime/felix/config.properties	2009-04-18 17:42:11 UTC (rev 63)
@@ -26,7 +26,7 @@
  file:bundle/org.apache.felix.eventadmin-1.0.0.jar \
  file:bundle/org.apache.felix.configadmin-1.0.10.jar \
  file:bundle/org.apache.felix.metatype-1.0.2.jar \
- file:bundle/org.apache.felix.http.jetty-0.9.0.jar \
+ file:bundle/org.apache.felix.http.jetty-1.0.0.jar \
  file:bundle/org.apache.felix.webconsole-1.2.8.jar \
  file:bundle/org.apache.felix.ipojo-1.2.0.jar \
  file:bundle/org.apache.felix.ipojo.composite-1.2.0.jar \

Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml	2009-04-15 07:36:23 UTC (rev 62)
+++ trunk/runtime/felix/pom.xml	2009-04-18 17:42:11 UTC (rev 63)
@@ -110,16 +110,11 @@
 			<version>1.0.2</version>
 			<scope>runtime</scope>
 		</dependency>
-		
-		<!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle.
-			TODO : replace this system dependency as soon as the Apache Felixh http.jetty bundle is released.
-		-->
 		<dependency>
 			<groupId>org.apache.felix</groupId> 
   			<artifactId>org.apache.felix.http.jetty</artifactId>
-			<version>0.9.0</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/org.apache.felix.http.jetty-0.9.0.jar</systemPath>
+			<version>1.0.0</version>
+			<scope>runtime</scope>
 		</dependency>
 		
 		<!-- iPOJO bundles -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.