Author: clement
Date: Fri Feb 13 11:09:52 2009
New Revision: 744064
URL: http://svn.apache.org/viewvc?rev=744064&view=rev
Log:
Update tutorial to use iPOJO 1.2.0
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.apache.felix.shell-1.0.2.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.compendium-1.2.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.core-1.2.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/
(props changed)
- copied from r743685,
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/comand/
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/bnd-0.0.249.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.configadmin-1.0.10.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding.html
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/apache.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/button.html
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/button_data/
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/button_data/2008-usa-125x125.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/button_data/2009-europe-125x125.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/forbidden.gif
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/linkext7.gif
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/logo.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/mail_small.gif
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-framework-launching-and-embedding_files/site.css
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation.html
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/apache.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/button.html
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/button_data/
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/button_data/2008-usa-125x125.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/button_data/2009-europe-125x125.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/information.gif
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/linkext7.gif
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/logo.png
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/mail_small.gif
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/apache-felix-usage-documentation_files/site.css
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/doc/changelog.txt
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/ipojo/org.apache.felix.ipojo-1.2.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.2.0.jar
(with props)
Removed:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.apache.felix.shell-1.0.0.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.compendium-1.0.0.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.core-1.0.0.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/comand/
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/bnd-0.0.223.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/org.apache.felix.ipojo.ant-1.0.0.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.0.3.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell-1.0.1.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.1.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/ipojo/org.apache.felix.configadmin-1.0.1.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/ipojo/org.apache.felix.ipojo-1.0.0.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.0.0.jar
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/build.xml
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/
(props changed)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/build.xml
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/config.admin.tutorial.bnd
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/metadata.xml
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/CreateConfiguration.java
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/DeleteConfiguration.java
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/ListConfiguration.java
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/UpdateConfiguration.java
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/ (props
changed)
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/NOTICE
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bin/felix.jar
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/conf/config.properties
Modified: felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/build.xml?rev=744064&r1=744063&r2=744064&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/build.xml
(original)
+++ felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/build.xml Fri
Feb 13 11:09:52 2009
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
-<project name="configadmin.tutorial" default="dist" basedir=".">
+<project name="configadmin.tutorial" default="package" basedir=".">
<target name="clean">
<ant dir="config.admin.tutorial" target="clean"/>
- <delete dir="felix/cache"/>
+ <delete dir="felix/felix-cache"/>
</target>
<target name="package">
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 13 11:09:52 2009
@@ -1,3 +1,4 @@
.classpath
.project
bin
+output
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/build.xml?rev=744064&r1=744063&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/build.xml
Fri Feb 13 11:09:52 2009
@@ -8,8 +8,8 @@
<property name="output.dir" value="output"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="tasks/bnd-0.0.223.jar"/>
- <taskdef name="ipojo"
classpath="tasks/org.apache.felix.ipojo.ant-1.0.0.jar"
+ classpath="tasks/bnd-0.0.249.jar"/>
+ <taskdef name="ipojo"
classpath="tasks/org.apache.felix.ipojo.ant-1.2.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
<target name="clean">
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/config.admin.tutorial.bnd
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/config.admin.tutorial.bnd?rev=744064&r1=744063&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/config.admin.tutorial.bnd
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/config.admin.tutorial.bnd
Fri Feb 13 11:09:52 2009
@@ -1,3 +1,3 @@
Import-Package: *
-Private-Package: org.apache.felix.ipojo.example.ca.component,
org.apache.felix.ipojo.example.ca.comand
+Private-Package: org.apache.felix.ipojo.example.ca.component,
org.apache.felix.ipojo.example.ca.command
Export-Package: org.apache.felix.ipojo.example.ca.service
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.apache.felix.shell-1.0.2.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.apache.felix.shell-1.0.2.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.apache.felix.shell-1.0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.compendium-1.2.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.compendium-1.2.0.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.compendium-1.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.core-1.2.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.core-1.2.0.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/libs/org.osgi.core-1.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/metadata.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/metadata.xml?rev=744064&r1=744063&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/metadata.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/metadata.xml
Fri Feb 13 11:09:52 2009
@@ -1,26 +1,26 @@
<ipojo>
<!-- Declares commands -->
-<component
classname="org.apache.felix.ipojo.example.ca.comand.CreateConfiguration"
architecture="false" factory="false">
+<component
classname="org.apache.felix.ipojo.example.ca.command.CreateConfiguration"
architecture="false" factory="false">
<provides/>
<requires field="pm"/>
</component>
-<component
classname="org.apache.felix.ipojo.example.ca.comand.DeleteConfiguration"
architecture="false" factory="false">
+<component
classname="org.apache.felix.ipojo.example.ca.command.DeleteConfiguration"
architecture="false" factory="false">
<provides/>
<requires field="pm"/>
</component>
-<component
classname="org.apache.felix.ipojo.example.ca.comand.ListConfiguration"
architecture="false" factory="false">
+<component
classname="org.apache.felix.ipojo.example.ca.command.ListConfiguration"
architecture="false" factory="false">
<provides/>
<requires field="pm"/>
</component>
-<component
classname="org.apache.felix.ipojo.example.ca.comand.UpdateConfiguration"
architecture="false" factory="false">
+<component
classname="org.apache.felix.ipojo.example.ca.command.UpdateConfiguration"
architecture="false" factory="false">
<provides/>
<requires field="pm"/>
</component>
<!-- Create one instance of each commands -->
-<instance
component="org.apache.felix.ipojo.example.ca.comand.CreateConfiguration"/>
-<instance
component="org.apache.felix.ipojo.example.ca.comand.DeleteConfiguration"/>
-<instance
component="org.apache.felix.ipojo.example.ca.comand.ListConfiguration"/>
-<instance
component="org.apache.felix.ipojo.example.ca.comand.UpdateConfiguration"/>
+<instance
component="org.apache.felix.ipojo.example.ca.command.CreateConfiguration"/>
+<instance
component="org.apache.felix.ipojo.example.ca.command.DeleteConfiguration"/>
+<instance
component="org.apache.felix.ipojo.example.ca.command.ListConfiguration"/>
+<instance
component="org.apache.felix.ipojo.example.ca.command.UpdateConfiguration"/>
<!-- Hello1 component type -->
<component classname="org.apache.felix.ipojo.example.ca.component.Hello1"
factory="hello1" immediate="true" architecture="true"/>
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/CreateConfiguration.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/CreateConfiguration.java?rev=744064&r1=743685&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/CreateConfiguration.java
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/CreateConfiguration.java
Fri Feb 13 11:09:52 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.ipojo.example.ca.comand;
+package org.apache.felix.ipojo.example.ca.command;
import java.io.IOException;
import java.io.PrintStream;
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/DeleteConfiguration.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/DeleteConfiguration.java?rev=744064&r1=743685&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/DeleteConfiguration.java
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/DeleteConfiguration.java
Fri Feb 13 11:09:52 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.ipojo.example.ca.comand;
+package org.apache.felix.ipojo.example.ca.command;
import java.io.IOException;
import java.io.PrintStream;
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/ListConfiguration.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/ListConfiguration.java?rev=744064&r1=743685&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/ListConfiguration.java
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/ListConfiguration.java
Fri Feb 13 11:09:52 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.ipojo.example.ca.comand;
+package org.apache.felix.ipojo.example.ca.command;
import java.io.IOException;
import java.io.PrintStream;
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/UpdateConfiguration.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/UpdateConfiguration.java?rev=744064&r1=743685&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/UpdateConfiguration.java
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/src/org/apache/felix/ipojo/example/ca/command/UpdateConfiguration.java
Fri Feb 13 11:09:52 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.ipojo.example.ca.comand;
+package org.apache.felix.ipojo.example.ca.command;
import java.io.IOException;
import java.io.PrintStream;
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/bnd-0.0.249.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/bnd-0.0.249.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/bnd-0.0.249.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/config.admin.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 13 11:09:52 2009
@@ -0,0 +1 @@
+felix-cache
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/NOTICE
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/NOTICE?rev=744064&r1=744063&r2=744064&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/NOTICE
(original)
+++ felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/NOTICE
Fri Feb 13 11:09:52 2009
@@ -10,7 +10,7 @@
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
This product includes software from http://kxml.sourceforge.net.
@@ -21,7 +21,7 @@
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bin/felix.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bin/felix.jar?rev=744064&r1=744063&r2=744064&view=diff
==============================================================================
Binary files - no diff available.
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.configadmin-1.0.10.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.configadmin-1.0.10.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.configadmin-1.0.10.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar?rev=744064&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/conf/config.properties
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/conf/config.properties?rev=744064&r1=744063&r2=744064&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/conf/config.properties
(original)
+++
felix/sandbox/clement/ipojo-tutorials/config.admin.tutorial/felix/conf/config.properties
Fri Feb 13 11:09:52 2009
@@ -18,463 +18,64 @@
#
# Framework config properties.
#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.3.2 \
- ${jre-${java.specification.version}}
+# To override the packages the framework exports by default from the
+# class path, set this variable.
+#org.osgi.framework.system.packages=
+
+# To append packages to the default set of exported system packages,
+# set this value.
+#org.osgi.framework.system.packages.extra=
+
+# The following property makes specified packages from the class path
+# available to all bundles. You should avoid using this property.
#org.osgi.framework.bootdelegation=sun.*,com.sun.*
-#felix.cache.profile=foo
-felix.cache.dir=cache
+
+# The following property explicitly specifies the location of the bundle
+# cache, which defaults to "felix-cache" in the current working directory.
+# If this value is not absolute, then the felix.cache.rootdir controls
+# how the absolute location is calculated. (See next property)
+#org.osgi.framework.storage=${felix.cache.rootdir}/felix-cache
+
+# The following property is used to convert a relative bundle cache
+# location into an absolute one by specifying the root to prepend to
+# the relative cache path. The default for this property is the
+# current working directory.
+#felix.cache.rootdir=${user.dir}
+
+# The following property controls whether the bundle cache is flushed
+# the first time the framework is initialized. Possible values are
+# "none" and "onFirstInit"; the default is "none".
+org.osgi.framework.storage.clean=onFirstInit
+
felix.auto.start.1= \
- file:bundle/org.apache.felix.shell-1.0.1.jar \
- file:bundle/org.apache.felix.shell.tui-1.0.1.jar \
- file:bundle/org.apache.felix.bundlerepository-1.0.3.jar \
- file:ipojo/org.apache.felix.ipojo-1.0.0.jar \
- file:ipojo/org.apache.felix.ipojo.arch-1.0.0.jar \
- file:ipojo/org.apache.felix.configadmin-1.0.1.jar
-felix.log.level=4
-felix.startlevel.framework=1
-felix.startlevel.bundle=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.configadmin-1.0.10.jar \
+ file:ipojo/org.apache.felix.ipojo-1.2.0.jar \
+ file:ipojo/org.apache.felix.ipojo.arch-1.2.0.jar
+
+felix.log.level=1
+
+# Sets the initial start level of the framework upon startup.
+#org.osgi.framework.startlevel=1
+
+# Sets the start level of newly installed bundles.
+#felix.startlevel.bundle=1
+
+# Invalid fragment bundles throw an 'exception' by default, but
+# uncomment the follow line to have them log a 'warning' instead.
+#felix.fragment.validation=warning
+
+# Felix installs a stream and content handler factories by default,
+# uncomment the following line to not install them.
#felix.service.urlhandlers=false
#
# Bundle config properties.
#
+
org.osgi.service.http.port=8080
osgi.shell.telnet=on
-#obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository
-
-
-#
-# Java platform package export properties.
-#
-jre-1.3=, \
- javax.accessibility; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- version="1.3.0"
-
-jre-1.4=, \
- javax.accessibility; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.w3c.dom; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.4.0"
-
-jre-1.5=, \
- javax.accessibility; \
- javax.activity; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.5.0"
-
-jre-1.6=, \
- javax.accessibility; \
- javax.activation; \
- javax.activity; \
- javax.annotation; \
- javax.annotation.processing; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.jws; \
- javax.jws.soap; \
- javax.lang.model; \
- javax.lang.model.element; \
- javax.lang.model.type; \
- javax.lang.model.util; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.script; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.cert; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.tools; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.bind; \
- javax.xml.bind.annotation; \
- javax.xml.bind.annotation.adapters; \
- javax.xml.bind.attachment; \
- javax.xml.bind.helpers; \
- javax.xml.bind.util; \
- javax.xml.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version=\"1.6.0\"
+obr.repository.url=http://felix.apache.org/obr/releases.xml
