Author: clement
Date: Wed Apr 28 07:28:53 2010
New Revision: 938806
URL: http://svn.apache.org/viewvc?rev=938806&view=rev
Log:
update to latest felix and iPOJO
Removed:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/doc/
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/ipojo/
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/src/main/java/ipojo/example/source.txt
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/src/main/java/ipojo/example/hello/impl/source.txt
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/bin/felix.jar
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/conf/config.properties
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/metadata.xml
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/pom.xml
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/metadata.xml
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/pom.xml
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.service/pom.xml
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/bin/felix.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/bin/felix.jar?rev=938806&r1=938805&r2=938806&view=diff
==============================================================================
Binary files - no diff available.
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/conf/config.properties
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/conf/config.properties?rev=938806&r1=938805&r2=938806&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/conf/config.properties
(original)
+++
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/felix/conf/config.properties
Wed Apr 28 07:28:53 2010
@@ -31,50 +31,70 @@
# available to all bundles. You should avoid using this property.
#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+# Felix tries to guess when to implicitly boot delegate in certain
+# situations to ease integration without outside code. This feature
+# is enabled by default, uncomment the following line to disable it.
+#felix.bootdelegation.implicit=false
+
# 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
+#org.osgi.framework.storage=${dollar}{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}
+#felix.cache.rootdir=${dollar}{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
+#org.osgi.framework.storage.clean=onFirstInit
-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:ipojo/org.apache.felix.ipojo-1.4.0.jar \
- file:ipojo/org.apache.felix.ipojo.arch-1.4.0.jar
+# The following property determines which actions are performed when
+# processing the auto-deploy directory. It is a comma-delimited list of
+# the following values: 'install', 'start', 'update', and 'uninstall'.
+# An undefined or blank value is equivalent to disabling auto-deploy
+# processing.
+felix.auto.deploy.action=install,start
+
+# The following property specifies the directory to use as the bundle
+# auto-deploy directory; the default is 'bundle' in the working directory.
+#felix.auto.deploy.dir=bundle
+
+# The following property is a space-delimited list of bundle URLs
+# to install when the framework starts. The ending numerical component
+# is the target start level. Any number of these properties may be
+# specified for different start levels.
+#felix.auto.install.1=
+
+# The following property is a space-delimited list of bundle URLs
+# to install and start when the framework starts. The ending numerical
+# component is the target start level. Any number of these properties
+# may be specified for different start levels.
+#felix.auto.start.1=
felix.log.level=1
# Sets the initial start level of the framework upon startup.
-#org.osgi.framework.startlevel=1
+#org.osgi.framework.startlevel.beginning=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
+# The launcher registers a shutdown hook to cleanly stop the framework
+# by default, uncomment the following line to disable it.
+#felix.shutdown.hook=false
+
#
# Bundle config properties.
#
org.osgi.service.http.port=8080
-osgi.shell.telnet=on
obr.repository.url=http://felix.apache.org/obr/releases.xml
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/metadata.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/metadata.xml?rev=938806&r1=938805&r2=938806&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/metadata.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/metadata.xml
Wed Apr 28 07:28:53 2010
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<iPOJO>
- <component className="ipojo.example.hello.client.HelloClient"
- architecture="true">
- <requires field="m_hello" />
- <callback transition="validate" method="starting" />
- <callback transition="invalidate" method="stopping" />
- <properties>
- <property field="m_name" name="hello.name" />
- </properties>
- </component>
- <instance component="ipojo.example.hello.client.HelloClient">
- <property name="hello.name" value="clement" />
- </instance>
-</iPOJO>
\ No newline at end of file
+<ipojo
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="org.apache.felix.ipojo
http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd";
+ xmlns="org.apache.felix.ipojo">
+
+ <component classname="ipojo.example.hello.client.HelloClient">
+ <requires field="m_hello" />
+ <callback transition="validate" method="starting" />
+ <callback transition="invalidate" method="stopping" />
+ <properties>
+ <property field="m_name" name="hello.name" />
+ </properties>
+ </component>
+
+ <instance component="ipojo.example.hello.client.HelloClient">
+ <property name="hello.name" value="world" />
+ </instance>
+</ipojo>
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/pom.xml?rev=938806&r1=938805&r2=938806&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/pom.xml
(original)
+++ felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.client/pom.xml
Wed Apr 28 07:28:53 2010
@@ -1,66 +1,66 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<project>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging><!-- Use the BND Maven plug-in -->
- <groupId>ipojo.examples</groupId>
- <artifactId>hello.client</artifactId>
- <version>1.0.0</version>
- <name>Hello Service Client</name>
- <dependencies>
- <dependency>
- <groupId>ipojo.examples</groupId>
- <artifactId>hello.service</artifactId>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging><!-- Use the BND Maven plug-in -->
+ <groupId>ipojo.examples</groupId>
+ <artifactId>hello.client</artifactId>
+ <version>1.0.0</version>
+ <name>Hello Service Client</name>
+ <dependencies>
+ <dependency>
+ <groupId>ipojo.examples</groupId>
+ <artifactId>hello.service</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <version>1.4.3</version>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>
- ${pom.artifactId}
- </Bundle-SymbolicName>
- <Private-Package>
-
ipojo.example.hello.client
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-ipojo-plugin</artifactId>
- <version>1.4.0</version>
- <executions>
- <execution>
- <goals>
-
<goal>ipojo-bundle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.0.1</version>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${pom.artifactId}
+ </Bundle-SymbolicName>
+ <Private-Package>
+ ipojo.example.hello.client
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-ipojo-plugin</artifactId>
+ <version>1.6.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>ipojo-bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/metadata.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/metadata.xml?rev=938806&r1=938805&r2=938806&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/metadata.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/metadata.xml
Wed Apr 28 07:28:53 2010
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<iPOJO>
- <component className="ipojo.example.hello.impl.HelloImpl"
- name="HelloProvider" architecture="true">
- <provides />
- </component>
- <instance component="HelloProvider" name="HelloService" />
-</iPOJO>
\ No newline at end of file
+<ipojo
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="org.apache.felix.ipojo
http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd";
+ xmlns="org.apache.felix.ipojo">
+
+ <component classname="ipojo.example.hello.impl.HelloImpl"
+ name="HelloProvider">
+ <provides />
+ </component>
+
+ <instance component="HelloProvider" name="HelloService" />
+</ipojo>
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/pom.xml?rev=938806&r1=938805&r2=938806&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/pom.xml
(original)
+++ felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.impl/pom.xml Wed
Apr 28 07:28:53 2010
@@ -1,49 +1,49 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <groupId>ipojo.examples</groupId>
- <artifactId>hello.impl</artifactId>
- <version>1.0.0</version>
- <name>Hello Service Provider</name>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <groupId>ipojo.examples</groupId>
+ <artifactId>hello.impl</artifactId>
+ <version>1.0.0</version>
+ <name>Hello Service Provider</name>
- <dependencies>
- <dependency>
- <groupId>ipojo.examples</groupId>
- <artifactId>hello.service</artifactId>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>ipojo.examples</groupId>
+ <artifactId>hello.service</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>
- ${pom.artifactId}
- </Bundle-SymbolicName>
- <Private-Package>
- ipojo.example.hello.impl
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-ipojo-plugin</artifactId>
- <version>1.4.0</version>
- <executions>
- <execution>
- <goals>
-
<goal>ipojo-bundle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${pom.artifactId}
+ </Bundle-SymbolicName>
+ <Private-Package>
+ ipojo.example.hello.impl
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-ipojo-plugin</artifactId>
+ <version>1.6.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>ipojo-bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.service/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.service/pom.xml?rev=938806&r1=938805&r2=938806&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.service/pom.xml
(original)
+++ felix/sandbox/clement/ipojo-tutorials/maven.tutorial/hello.service/pom.xml
Wed Apr 28 07:28:53 2010
@@ -1,47 +1,47 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<project>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <groupId>ipojo.examples</groupId>
- <artifactId>hello.service</artifactId>
- <version>1.0.0</version>
- <name>Hello Service</name>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <groupId>ipojo.examples</groupId>
+ <artifactId>hello.service</artifactId>
+ <version>1.0.0</version>
+ <name>Hello Service</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>
- ${pom.artifactId}
- </Bundle-SymbolicName>
- <Export-Package>
- ipojo.example.hello
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${pom.artifactId}
+ </Bundle-SymbolicName>
+ <Export-Package>
+ ipojo.example.hello
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
