[Ipojo-toolbox-commits] SF.net SVN: ipojo-toolbox:[61] trunk
Brought to you by:
bourretp
Menu
▾
▴
[Ipojo-toolbox-commits] SF.net SVN: ipojo-toolbox:[61] trunk
|
From: <bou...@us...> - 2009-04-10 02:26:42
|
Revision: 61
http://ipojo-toolbox.svn.sourceforge.net/ipojo-toolbox/?rev=61&view=rev
Author: bourretp
Date: 2009-04-10 02:26:40 +0000 (Fri, 10 Apr 2009)
Log Message:
-----------
* Fixed parent pom file encoding to UTF-8.
Felix-runtime :
* Updated bundles version in the felix-runtime.
+ Added metatype bundle.
* Fixed pom encoding to UTF-8.
Modified Paths:
--------------
trunk/pom/pom.xml
trunk/runtime/felix/config.properties
trunk/runtime/felix/felix.bat
trunk/runtime/felix/felix.sh
trunk/runtime/felix/pom.xml
Modified: trunk/pom/pom.xml
===================================================================
--- trunk/pom/pom.xml 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/pom/pom.xml 2009-04-10 02:26:40 UTC (rev 61)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: trunk/runtime/felix/config.properties
===================================================================
--- trunk/runtime/felix/config.properties 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/config.properties 2009-04-10 02:26:40 UTC (rev 61)
@@ -15,20 +15,19 @@
# specific language governing permissions and limitations
# under the License.
-# The log level for iPOJO
-ipojo.log.level=WARNING
-# Starts the bundles
+# Starts the following bundles at startup.
felix.auto.start.1= \
- file:bundle/org.apache.felix.shell-1.0.2.jar \
- file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
- file:bundle/org.apache.felix.bundlerepository-1.2.1.jar \
+ file:bundle/org.apache.felix.shell-1.2.0.jar \
+ file:bundle/org.apache.felix.shell.tui-1.2.0.jar \
+ file:bundle/org.apache.felix.bundlerepository-1.4.0.jar \
file:bundle/org.osgi.compendium-1.2.0.jar \
file:bundle/org.apache.felix.log-1.0.0.jar \
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.webconsole-1.2.2.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 \
file:bundle/org.apache.felix.ipojo.arch-1.2.0.jar \
Modified: trunk/runtime/felix/felix.bat
===================================================================
--- trunk/runtime/felix/felix.bat 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/felix.bat 2009-04-10 02:26:40 UTC (rev 61)
@@ -14,4 +14,4 @@
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
-@java %* -Dfelix.config.properties=file:config.properties -jar bundle\org.apache.felix.main-1.4.1.jar
+@java %* -Dfelix.config.properties=file:config.properties -jar bundle\org.apache.felix.main-1.6.0.jar
Modified: trunk/runtime/felix/felix.sh
===================================================================
--- trunk/runtime/felix/felix.sh 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/felix.sh 2009-04-10 02:26:40 UTC (rev 61)
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
#
-java $@ -Dfelix.config.properties="file:config.properties" -jar bundle/org.apache.felix.main-1.4.1.jar
+java $@ -Dfelix.config.properties="file:config.properties" -jar bundle/org.apache.felix.main-1.6.0.jar
Modified: trunk/runtime/felix/pom.xml
===================================================================
--- trunk/runtime/felix/pom.xml 2009-04-09 16:59:42 UTC (rev 60)
+++ trunk/runtime/felix/pom.xml 2009-04-10 02:26:40 UTC (rev 61)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -31,11 +31,11 @@
<!-- Project coordinates -->
<groupId>net.sourceforge.ipojo-toolbox</groupId>
<artifactId>felix-runtime</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Project's informations -->
- <name>iPOJO-Toolbox : Felix runtime environment</name>
+ <name>iPOJO-Toolbox : Felix runtime environment pack</name>
<description>Collection of Apache Felix and iPOJO bundles, grouped in a single archive, that provides a basic environment to run and manage iPOJO components.</description>
<url>http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-runtime</url>
<inceptionYear>2009</inceptionYear>
@@ -53,25 +53,25 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.4.1</version>
+ <version>1.6.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.2</version>
+ <version>1.2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.0.2</version>
+ <version>1.2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -99,20 +99,29 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <!-- As the Felix Jetty HTTP Service has never been released, we embeds a fake-released version of this bundle. -->
<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>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>1.2.8</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>1.2.2</version>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <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>
+ </dependency>
+
<!-- iPOJO bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
