felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r464995 - in /incubator/felix/trunk/examples/simple: native/ src/org/apache/felix/examples/simple/ src/org/apache/felix/examples/simple/embedded/ src/org/apache/felix/simple/
Date Tue, 17 Oct 2006 18:42:06 GMT
Author: rickhall
Date: Tue Oct 17 11:42:05 2006
New Revision: 464995

URL: http://svn.apache.org/viewvc?view=rev&rev=464995
Log:
Finished moving "simple" bundle to examples directory.

Added:
    incubator/felix/trunk/examples/simple/native/org_apache_felix_examples_simple_Activator.h
  (with props)
    incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/
      - copied from r464991, incubator/felix/trunk/examples/simple/src/org/apache/felix/simple/
Removed:
    incubator/felix/trunk/examples/simple/native/org_apache_felix_simple_Activator.h
    incubator/felix/trunk/examples/simple/src/org/apache/felix/simple/
Modified:
    incubator/felix/trunk/examples/simple/native/build.txt
    incubator/felix/trunk/examples/simple/native/libfoo.so
    incubator/felix/trunk/examples/simple/native/simple_bundle_foo_method.c
    incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/Activator.java
    incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java
    incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/manifest.mf

Modified: incubator/felix/trunk/examples/simple/native/build.txt
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/examples/simple/native/build.txt?view=diff&rev=464995&r1=464994&r2=464995
==============================================================================
--- incubator/felix/trunk/examples/simple/native/build.txt (original)
+++ incubator/felix/trunk/examples/simple/native/build.txt Tue Oct 17 11:42:05 2006
@@ -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

Modified: incubator/felix/trunk/examples/simple/native/libfoo.so
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/examples/simple/native/libfoo.so?view=diff&rev=464995&r1=464994&r2=464995
==============================================================================
Binary files - no diff available.

Added: incubator/felix/trunk/examples/simple/native/org_apache_felix_examples_simple_Activator.h
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/examples/simple/native/org_apache_felix_examples_simple_Activator.h?view=auto&rev=464995
==============================================================================
--- incubator/felix/trunk/examples/simple/native/org_apache_felix_examples_simple_Activator.h
(added)
+++ incubator/felix/trunk/examples/simple/native/org_apache_felix_examples_simple_Activator.h
Tue Oct 17 11:42:05 2006
@@ -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

Propchange: incubator/felix/trunk/examples/simple/native/org_apache_felix_examples_simple_Activator.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/felix/trunk/examples/simple/native/simple_bundle_foo_method.c
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/examples/simple/native/simple_bundle_foo_method.c?view=diff&rev=464995&r1=464994&r2=464995
==============================================================================
--- incubator/felix/trunk/examples/simple/native/simple_bundle_foo_method.c (original)
+++ incubator/felix/trunk/examples/simple/native/simple_bundle_foo_method.c Tue Oct 17 11:42:05
2006
@@ -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!";

Modified: incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/Activator.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/Activator.java?view=diff&rev=464995&r1=464991&r2=464995
==============================================================================
--- incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/Activator.java
(original)
+++ incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/Activator.java
Tue Oct 17 11:42:05 2006
@@ -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

Modified: incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java?view=diff&rev=464995&r1=464991&r2=464995
==============================================================================
--- incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java
(original)
+++ incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/embedded/Embedded.java
Tue Oct 17 11:42:05 2006
@@ -1,4 +1,4 @@
-package org.apache.felix.simple.embedded;
+package org.apache.felix.examples.simple.embedded;
 
 public class Embedded
 {

Modified: incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/manifest.mf
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/manifest.mf?view=diff&rev=464995&r1=464991&r2=464995
==============================================================================
--- incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/manifest.mf
(original)
+++ incubator/felix/trunk/examples/simple/src/org/apache/felix/examples/simple/manifest.mf
Tue Oct 17 11:42:05 2006
@@ -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.*



Mime
View raw message