Finished moving "simple" bundle to examples directory.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@464995 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/examples/simple/native/build.txt b/examples/simple/native/build.txt
index b79f659..d94ebbd 100644
--- a/examples/simple/native/build.txt
+++ b/examples/simple/native/build.txt
@@ -1,5 +1,5 @@
cd ..; ant ; cd native
-javah -classpath ../simple.jar -jni org.apache.felix.simple.Activator
+javah -classpath ../simple.jar -jni org.apache.felix.examples.simple.Activator
gcc -I/usr/java/jdk/include \
-I/usr/java/jdk/include/linux \
-c simple_bundle_foo_method.c -o simple_bundle_foo_method.o
diff --git a/examples/simple/native/libfoo.so b/examples/simple/native/libfoo.so
index 663cc19..5d246be 100644
--- a/examples/simple/native/libfoo.so
+++ b/examples/simple/native/libfoo.so
Binary files differ
diff --git a/examples/simple/native/org_apache_felix_examples_simple_Activator.h b/examples/simple/native/org_apache_felix_examples_simple_Activator.h
new file mode 100644
index 0000000..a2a5bea
--- /dev/null
+++ b/examples/simple/native/org_apache_felix_examples_simple_Activator.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_apache_felix_examples_simple_Activator */
+
+#ifndef _Included_org_apache_felix_examples_simple_Activator
+#define _Included_org_apache_felix_examples_simple_Activator
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: org_apache_felix_examples_simple_Activator
+ * Method: foo
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_apache_felix_examples_simple_Activator_foo
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/examples/simple/native/org_apache_felix_simple_Activator.h b/examples/simple/native/org_apache_felix_simple_Activator.h
deleted file mode 100644
index 06fd02d..0000000
--- a/examples/simple/native/org_apache_felix_simple_Activator.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_apache_felix_simple_Activator */
-
-#ifndef _Included_org_apache_felix_simple_Activator
-#define _Included_org_apache_felix_simple_Activator
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_apache_felix_simple_Activator
- * Method: foo
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_apache_felix_simple_Activator_foo
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/examples/simple/native/simple_bundle_foo_method.c b/examples/simple/native/simple_bundle_foo_method.c
index a684abe..90f5a1c 100644
--- a/examples/simple/native/simple_bundle_foo_method.c
+++ b/examples/simple/native/simple_bundle_foo_method.c
@@ -1,7 +1,7 @@
-#include "org_apache_felix_simple_Activator.h"
+#include "org_apache_felix_examples_simple_Activator.h"
JNIEXPORT jstring JNICALL
- Java_org_apache_felix_simple_Activator_foo
+ Java_org_apache_felix_examples_simple_Activator_foo
(JNIEnv *env, jobject obj)
{
char *cstr = "Hello!";
diff --git a/examples/simple/src/org/apache/felix/simple/Activator.java b/examples/simple/src/org/apache/felix/examples/simple/Activator.java
similarity index 95%
rename from examples/simple/src/org/apache/felix/simple/Activator.java
rename to examples/simple/src/org/apache/felix/examples/simple/Activator.java
index d344cd2..63c80e6 100644
--- a/examples/simple/src/org/apache/felix/simple/Activator.java
+++ b/examples/simple/src/org/apache/felix/examples/simple/Activator.java
@@ -1,10 +1,10 @@
-package org.apache.felix.simple;
+package org.apache.felix.examples.simple;
import javax.servlet.Servlet;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.apache.felix.simple.embedded.Embedded;
+import org.apache.felix.examples.simple.embedded.Embedded;
/**
* A very simple bundle that prints out a message when it is started and
diff --git a/examples/simple/src/org/apache/felix/simple/embedded/Embedded.java b/examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java
similarity index 70%
rename from examples/simple/src/org/apache/felix/simple/embedded/Embedded.java
rename to examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java
index 69b8de7..87e41b3 100644
--- a/examples/simple/src/org/apache/felix/simple/embedded/Embedded.java
+++ b/examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java
@@ -1,4 +1,4 @@
-package org.apache.felix.simple.embedded;
+package org.apache.felix.examples.simple.embedded;
public class Embedded
{
diff --git a/examples/simple/src/org/apache/felix/simple/manifest.mf b/examples/simple/src/org/apache/felix/examples/simple/manifest.mf
similarity index 60%
rename from examples/simple/src/org/apache/felix/simple/manifest.mf
rename to examples/simple/src/org/apache/felix/examples/simple/manifest.mf
index fdec8f9..433ff2f 100644
--- a/examples/simple/src/org/apache/felix/simple/manifest.mf
+++ b/examples/simple/src/org/apache/felix/examples/simple/manifest.mf
@@ -1,10 +1,10 @@
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.felix.simple
+Bundle-SymbolicName: org.apache.felix.examples.simple
Bundle-Version: 1.0.0
Bundle-Name: Simple Bundle
Bundle-Description: Simple bundle that demonstates OSGi features.
-Bundle-Activator: org.apache.felix.simple.Activator
-Bundle-ClassPath: .,org/apache/felix/simple/embedded.jar
+Bundle-Activator: org.apache.felix.examples.simple.Activator
+Bundle-ClassPath: .,org/apache/felix/examples/simple/embedded.jar
Bundle-NativeCode: /libfoo.so; osname=Linux; processor=x86
Import-Package: org.osgi.framework
DynamicImport-Package: javax.servlet.*