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 2009/09/18 08:38:54 UTC
svn commit: r816484 - in
/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial: ./
Junit-OSGi-Example/ Junit-OSGi-Example/lib/ felix/ felix/conf/ felix/ipojo/
Author: clement
Date: Fri Sep 18 06:38:53 2009
New Revision: 816484
URL: http://svn.apache.org/viewvc?rev=816484&view=rev
Log:
Update the junit4osgi tutorial with the latest iPOJO
Added:
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.4.0.jar (contents, props changed)
- copied, changed from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.2.0.jar
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.4.0.jar (contents, props changed)
- copied, changed from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.2.0.jar
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.4.0.jar (contents, props changed)
- copied, changed from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.2.0.jar
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.4.0.jar (contents, props changed)
- copied, changed from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.2.0.jar
Removed:
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.2.0.jar
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.2.0.jar
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.2.0.jar
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.2.0.jar
Modified:
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/build.xml
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/build.xml
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/conf/config.properties
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/script.txt
Modified: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/build.xml?rev=816484&r1=816483&r2=816484&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/build.xml Fri Sep 18 06:38:53 2009
@@ -30,7 +30,7 @@
<pathelement location="lib/org.apache.felix.ipojo.junit4osgi-1.1.0-SNAPSHOT.jar"/>
<pathelement location="lib/org.osgi.core-1.2.0.jar"/>
- <pathelement location="lib/org.apache.felix.ipojo-1.2.0.jar"/>
+ <pathelement location="lib/org.apache.felix.ipojo-1.4.0.jar"/>
</classpath>
Copied: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.4.0.jar (from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.2.0.jar)
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.4.0.jar?p2=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.4.0.jar&p1=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.2.0.jar&r1=816141&r2=816484&rev=816484&view=diff
==============================================================================
Binary files - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.4.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/lib/org.apache.felix.ipojo-1.4.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/build.xml?rev=816484&r1=816483&r2=816484&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/build.xml Fri Sep 18 06:38:53 2009
@@ -3,13 +3,13 @@
<project name="junit4osgi" default="package" basedir=".">
<target name="package">
- <ant dir="junit-example" target="package"/>
- <ant dir="junit-osgi-example" target="package"/>
+ <ant dir="Junit-Example" target="package"/>
+ <ant dir="Junit-OSGi-Example" target="package"/>
</target>
<target name="clean">
- <ant dir="junit-example" target="clean"/>
- <ant dir="junit-osgi-example" target="clean"/>
+ <ant dir="Junit-Example" target="clean"/>
+ <ant dir="Junit-OSGi-Example" target="clean"/>
<!-- clean Felix cache -->
<delete dir="felix/felix-cache"/>
Modified: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/conf/config.properties
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/conf/config.properties?rev=816484&r1=816483&r2=816484&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/conf/config.properties (original)
+++ felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/conf/config.properties Fri Sep 18 06:38:53 2009
@@ -52,9 +52,9 @@
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.2.0.jar \
- file:ipojo/org.apache.felix.ipojo.arch-1.2.0.jar \
- file:ipojo/org.apache.felix.ipojo.handler.extender-1.2.0.jar \
+ file:ipojo/org.apache.felix.ipojo-1.4.0.jar \
+ file:ipojo/org.apache.felix.ipojo.arch-1.4.0.jar \
+ file:ipojo/org.apache.felix.ipojo.handler.extender-1.4.0.jar \
file:ipojo/org.apache.felix.ipojo.junit4osgi-1.1.0-SNAPSHOT.jar \
file:ipojo/org.apache.felix.ipojo.junit4osgi.felix-command-1.1.0-SNAPSHOT.jar
Copied: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.4.0.jar (from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.2.0.jar)
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.4.0.jar?p2=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.4.0.jar&p1=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.2.0.jar&r1=816141&r2=816484&rev=816484&view=diff
==============================================================================
Binary files - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.4.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo-1.4.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.4.0.jar (from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.2.0.jar)
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.4.0.jar?p2=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.4.0.jar&p1=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.2.0.jar&r1=816141&r2=816484&rev=816484&view=diff
==============================================================================
Binary files - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.4.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-1.4.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.4.0.jar (from r816141, felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.2.0.jar)
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.4.0.jar?p2=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.4.0.jar&p1=felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.2.0.jar&r1=816141&r2=816484&rev=816484&view=diff
==============================================================================
Binary files - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.4.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ipojo/org.apache.felix.ipojo.handler.extender-1.4.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/script.txt
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/script.txt?rev=816484&r1=816483&r2=816484&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/script.txt (original)
+++ felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/script.txt Fri Sep 18 06:38:53 2009
@@ -1,2 +1,2 @@
-start file:../junit-example/output/Junit-Example.jar
-start file:../junit-osgi-example/output/Junit-OSGi-Example.jar
\ No newline at end of file
+start file:../Junit-Example/output/Junit-Example.jar
+start file:../Junit-OSGi-Example/output/Junit-OSGi-Example.jar