commit dd94f2816c0b5579e4fa5209bde0cdf78cc5bb2f
author Richard S. Hall <rickhall@apache.org> Tue Oct 17 18:36:57 2006 +0000
committer Richard S. Hall <rickhall@apache.org> Tue Oct 17 18:36:57 2006 +0000
tree fce15c854e34ea2e8d34cde38dc62feb936eb3fd
parent d9c80e4fd7c1eca425237b60df52de8a128c7175

Decided to move the "simple" bundle into the examples directory.


git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@464991 13f79535-47bb-0310-9956-ffa450edef68

examples/simple/build.xml

diff --git a/simple/build.xml b/examples/simple/build.xml
similarity index 87%
rename from simple/build.xml
rename to examples/simple/build.xml
index 5ec0b7a..cd7167a 100644
--- a/simple/build.xml
+++ b/examples/simple/build.xml
@@ -42,9 +42,9 @@
 
     <!-- JAR the bundle. -->
     <target name="jar" depends="compile">
-        <jar jarfile="${output.dir}/org/apache/felix/${bundle.name}/embedded.jar"
+        <jar jarfile="${output.dir}/org/apache/felix/examples/${bundle.name}/embedded.jar"
             basedir="${output.dir}">
-            <include name="org/apache/felix/${bundle.name}/embedded/**"/>
+            <include name="org/apache/felix/examples/${bundle.name}/embedded/**"/>
         </jar>
 
         <copy todir="${output.dir}">
@@ -53,12 +53,12 @@
             </fileset>
         </copy>
 
-        <jar manifest="${src.dir}/org/apache/felix/${bundle.name}/manifest.mf"
+        <jar manifest="${src.dir}/org/apache/felix/examples/${bundle.name}/manifest.mf"
             jarfile="${bundle.dir}/${bundle.name}.jar"
             basedir="${output.dir}">
-            <include name="org/apache/felix/${bundle.name}/**"/>
+            <include name="org/apache/felix/examples/${bundle.name}/**"/>
             <include name="libfoo.so"/>
-            <exclude name="org/apache/felix/${bundle.name}/embedded/"/>
+            <exclude name="org/apache/felix/examples/${bundle.name}/embedded/"/>
         </jar>
     </target>
 

examples/simple/doc/index.html

diff --git a/simple/doc/index.html b/examples/simple/doc/index.html
similarity index 100%
rename from simple/doc/index.html
rename to examples/simple/doc/index.html

examples/simple/lib/org.osgi.core-0.8.0-SNAPSHOT.jar

diff --git a/simple/lib/org.osgi.core-0.8.0-SNAPSHOT.jar b/examples/simple/lib/org.osgi.core-0.8.0-SNAPSHOT.jar
similarity index 100%
rename from simple/lib/org.osgi.core-0.8.0-SNAPSHOT.jar
rename to examples/simple/lib/org.osgi.core-0.8.0-SNAPSHOT.jar
Binary files differ

examples/simple/lib/servlet-incomplete.jar

diff --git a/simple/lib/servlet-incomplete.jar b/examples/simple/lib/servlet-incomplete.jar
similarity index 100%
rename from simple/lib/servlet-incomplete.jar
rename to examples/simple/lib/servlet-incomplete.jar
Binary files differ

examples/simple/native/build.txt

diff --git a/simple/native/build.txt b/examples/simple/native/build.txt
similarity index 100%
rename from simple/native/build.txt
rename to examples/simple/native/build.txt

examples/simple/native/libfoo.so

diff --git a/simple/native/libfoo.so b/examples/simple/native/libfoo.so
similarity index 100%
rename from simple/native/libfoo.so
rename to examples/simple/native/libfoo.so
Binary files differ

examples/simple/native/org_apache_felix_simple_Activator.h

diff --git a/simple/native/org_apache_felix_simple_Activator.h b/examples/simple/native/org_apache_felix_simple_Activator.h
similarity index 100%
rename from simple/native/org_apache_felix_simple_Activator.h
rename to examples/simple/native/org_apache_felix_simple_Activator.h

examples/simple/native/simple_bundle_foo_method.c

diff --git a/simple/native/simple_bundle_foo_method.c b/examples/simple/native/simple_bundle_foo_method.c
similarity index 100%
rename from simple/native/simple_bundle_foo_method.c
rename to examples/simple/native/simple_bundle_foo_method.c

examples/simple/src/org/apache/felix/simple/Activator.java

diff --git a/simple/src/org/apache/felix/simple/Activator.java b/examples/simple/src/org/apache/felix/simple/Activator.java
similarity index 100%
rename from simple/src/org/apache/felix/simple/Activator.java
rename to examples/simple/src/org/apache/felix/simple/Activator.java

examples/simple/src/org/apache/felix/simple/embedded/Embedded.java

diff --git a/simple/src/org/apache/felix/simple/embedded/Embedded.java b/examples/simple/src/org/apache/felix/simple/embedded/Embedded.java
similarity index 100%
rename from simple/src/org/apache/felix/simple/embedded/Embedded.java
rename to examples/simple/src/org/apache/felix/simple/embedded/Embedded.java

examples/simple/src/org/apache/felix/simple/manifest.mf

diff --git a/simple/src/org/apache/felix/simple/manifest.mf b/examples/simple/src/org/apache/felix/simple/manifest.mf
similarity index 100%
rename from simple/src/org/apache/felix/simple/manifest.mf
rename to examples/simple/src/org/apache/felix/simple/manifest.mf