You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2010/04/29 20:58:50 UTC
svn commit: r939455 - in
/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial: felix/bin/
felix/bundle/ felix/conf/ felix/doc/ felix/ipojo/ hello.client.annotation/
hello.client.annotation/src/main/java/ipojo/example/hello/client/
hello.impl.anno...
Author: clement
Date: Thu Apr 29 18:58:49 2010
New Revision: 939455
URL: http://svn.apache.org/viewvc?rev=939455&view=rev
Log:
Update the annotation tutorial
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar (with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar (with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar (with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.401.jar (with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar (with props)
Removed:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/doc/
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/ipojo/
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/metadata.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/metadata.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/metadata.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.249.jar
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.2.0.jar
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar
Modified:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bin/felix.jar
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/conf/config.properties
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/pom.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/pom.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/pom.xml
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bin/felix.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bin/felix.jar?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
Binary files - no diff available.
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/conf/config.properties
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/conf/config.properties?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/conf/config.properties (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/felix/conf/config.properties Thu Apr 29 18:58:49 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/annotation.tutorial/hello.client.annotation/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml Thu Apr 29 18:58:49 2010
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<project name="hello.client.annotation" default="package" basedir=".">
-
+
<property name="src.dir" value="src"/>
<property name="build.dir" value="target/classes"/>
<property name="output.dir" value="target"/>
<property name="bundle.name" value="hello.client.annotation-1.0.0.jar"/>
-
+
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-1.2.0.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
-
+
<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="${output.dir}"/>
@@ -28,7 +28,7 @@
<classpath>
<filelist>
<file name="${basedir}/../hello.service/target/hello.service-1.0.0.jar"/>
- <file name="${basedir}/../tasks/org.apache.felix.ipojo.annotations-1.2.0.jar"/>
+ <file name="${basedir}/../tasks/org.apache.felix.ipojo.annotations-1.6.0.jar"/>
</filelist>
</classpath>
</javac>
@@ -36,15 +36,14 @@
<target name="package" depends="compile">
<bnd
- classpath="${build.dir}"
- failok="false"
- exceptions="true"
+ classpath="${build.dir}"
+ failok="false"
+ exceptions="true"
files="${ant.project.name}.bnd"
output="${output.dir}/${bundle.name}"/>
-
+
<ipojo
input="${output.dir}/${bundle.name}"
- metadata="metadata.xml"
/>
</target>
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/pom.xml?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/pom.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/pom.xml Thu Apr 29 18:58:49 2010
@@ -5,7 +5,7 @@
<artifactId>hello.client.annotation</artifactId>
<version>1.0.0</version>
<name>Hello Service Client using Annotations</name>
-
+
<dependencies>
<dependency>
<groupId>ipojo.examples</groupId>
@@ -15,11 +15,11 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</dependency>
</dependencies>
-
-
+
+
<build>
<plugins>
<plugin>
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/src/main/java/ipojo/example/hello/client/HelloClient.java Thu Apr 29 18:58:49 2010
@@ -1,4 +1,4 @@
-/*
+/*
* 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
@@ -24,14 +24,16 @@ import org.apache.felix.ipojo.annotation
import org.apache.felix.ipojo.annotations.Invalidate;
import org.apache.felix.ipojo.annotations.Requires;
import org.apache.felix.ipojo.annotations.Validate;
+import org.apache.felix.ipojo.annotations.Instantiate;
/**
* A simple Hello service client. This client use annotation instead of XML metadata.
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
@Component(name = "AnnotatedHelloClient", architecture = true)
+@Instantiate
public class HelloClient implements Runnable {
-
+
/** Delay between two invocations. */
private static final int DELAY = 10000;
@@ -66,7 +68,7 @@ public class HelloClient implements Runn
*/
public void invokeHelloServices() {
for (int i = 0; i < m_hello.length; i++) {
- System.out.println(i + " :" + m_hello[i].sayHello("Clement"));
+ System.out.println(i + " :" + m_hello[i].sayHello("World"));
}
}
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml Thu Apr 29 18:58:49 2010
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<project name="hello.impl.annotation" default="package" basedir=".">
-
+
<property name="src.dir" value="src"/>
<property name="build.dir" value="target/classes"/>
<property name="output.dir" value="target"/>
<property name="bundle.name" value="hello.impl.annotation-1.0.0.jar"/>
-
+
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-1.2.0.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
-
+
<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="${output.dir}"/>
@@ -28,7 +28,7 @@
<classpath>
<filelist>
<file name="${basedir}/../hello.service/target/hello.service-1.0.0.jar"/>
- <file name="${basedir}/../tasks/org.apache.felix.ipojo.annotations-1.2.0.jar"/>
+ <file name="${basedir}/../tasks/org.apache.felix.ipojo.annotations-1.6.0.jar"/>
</filelist>
</classpath>
</javac>
@@ -37,15 +37,14 @@
<target name="package" depends="compile">
<bnd
- classpath="${build.dir}"
- failok="false"
- exceptions="true"
+ classpath="${build.dir}"
+ failok="false"
+ exceptions="true"
files="${ant.project.name}.bnd"
output="${output.dir}/${bundle.name}"/>
-
+
<ipojo
input="${output.dir}/${bundle.name}"
- metadata="metadata.xml"
/>
</target>
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/pom.xml?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/pom.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/pom.xml Thu Apr 29 18:58:49 2010
@@ -6,9 +6,9 @@
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
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</dependency>
</dependencies>
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/src/main/java/ipojo/example/hello/impl/HelloImpl.java Thu Apr 29 18:58:49 2010
@@ -1,4 +1,4 @@
-/*
+/*
* 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
@@ -22,21 +22,24 @@ import ipojo.example.hello.Hello;
import org.apache.felix.ipojo.annotations.Component;
import org.apache.felix.ipojo.annotations.Provides;
+import org.apache.felix.ipojo.annotations.Instantiate;
/**
* Component implementing the Hello service.
- * This class used annotations to describe the component type.
+ * This class used annotations to describe the component type.
+ * The Instantiate annotation declares a simple instance of this type.
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
@Component
+@Instantiate
@Provides
public class HelloImpl implements Hello {
-
+
/**
* Returns an 'Hello' message.
* @param name : name
* @return Hello message
* @see ipojo.example.hello.Hello#sayHello(java.lang.String)
*/
- public String sayHello(String name) { return "hello " + name + " @"; }
+ public String sayHello(String name) { return "hello " + name; }
}
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml Thu Apr 29 18:58:49 2010
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
<project name="hello.service" default="package" basedir=".">
-
+
<property name="src.dir" value="src"/>
<property name="build.dir" value="target/classes"/>
<property name="output.dir" value="target"/>
<property name="bundle.name" value="hello.service-1.0.0.jar"/>
-
-
+
+
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
-
+ classpath="../tasks/bnd-0.0.401.jar"/>
+
<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="${output.dir}"/>
@@ -28,9 +28,9 @@
<target name="package" depends="compile">
<bnd
- classpath="${build.dir}"
- failok="false"
- exceptions="true"
+ classpath="${build.dir}"
+ failok="false"
+ exceptions="true"
files="${ant.project.name}.bnd"
output="${output.dir}/${bundle.name}"/>
</target>
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/pom.xml?rev=939455&r1=939454&r2=939455&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/pom.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/pom.xml Thu Apr 29 18:58:49 2010
@@ -6,9 +6,9 @@
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
@@ -29,7 +29,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.401.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.401.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.401.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar?rev=939455&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream