diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-02 15:37:05 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-02 15:37:05 +0000 |
commit | c30d85f5d1d1ead6e9ad703f87392992e38150ac (patch) | |
tree | 71322bd610db5f5dac2b5399c3ef1325cca5d7f5 /branches/sca-java-1.3/modules/implementation-osgi/src | |
parent | 4c7b2e5c0549718ed1814edbb1adb8166efe4fca (diff) |
Fix for TUSCANY-2444, merged from trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673421 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3/modules/implementation-osgi/src')
2 files changed, 13 insertions, 3 deletions
diff --git a/branches/sca-java-1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java b/branches/sca-java-1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java index 3bd18c3239..3b08bbc7dc 100644 --- a/branches/sca-java-1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java +++ b/branches/sca-java-1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java @@ -550,7 +550,7 @@ public class OSGiImplementationProvider implements ScopedImplementationProvider String EOL = System.getProperty("line.separator"); String interfaceName = interfaceClass.getName(); - String packageName = interfaceClass.getPackage().getName(); + String packageName = getPackageName(interfaceClass); String bundleName = "dummy.sca." + packageName; String manifestStr = "Manifest-Version: 1.0" + EOL @@ -645,6 +645,11 @@ public class OSGiImplementationProvider implements ScopedImplementationProvider return exp.getExportingBundle(); } + private static String getPackageName(Class<?> cls) { + String name = cls.getName(); + int index = name.lastIndexOf('.'); + return index == -1 ? "" : name.substring(0, index); + } private Bundle installDummyBundle(Class<?> interfaceClass) throws Exception { @@ -660,7 +665,7 @@ public class OSGiImplementationProvider implements ScopedImplementationProvider ArrayList<Class<?>> dummyClasses = new ArrayList<Class<?>>(); String interfaceName = interfaceClass.getName(); - String packageName = interfaceClass.getPackage().getName(); + String packageName = getPackageName(interfaceClass); String bundleName = "dummy.sca." + interfaceName; diff --git a/branches/sca-java-1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/branches/sca-java-1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java index 2fd163aab6..93b4dee033 100644 --- a/branches/sca-java-1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java +++ b/branches/sca-java-1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java @@ -36,6 +36,11 @@ import java.util.zip.ZipEntry; * @version $Rev$ $Date$ */ public class OSGiTestBundles { + private static String getPackageName(Class<?> cls) { + String name = cls.getName(); + int index = name.lastIndexOf('.'); + return index == -1 ? "" : name.substring(0, index); + } public static void createBundle(String jarName, Class<?> interfaceClass, Class<?> implClass) throws Exception { @@ -44,7 +49,7 @@ public class OSGiTestBundles { String EOL = System.getProperty("line.separator"); - String packageName = interfaceClass.getPackage().getName(); + String packageName = getPackageName(interfaceClass); String bundleName = interfaceClass.getName(); String manifestStr = "Manifest-Version: 1.0" + EOL |