Author: alesj Date: 2010-02-04 15:08:46 -0500 (Thu, 04 Feb 2010) New Revision: 100436 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd Log: Fix winz native usage. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-04 19:54:41 UTC (rev 100435) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-04 20:08:46 UTC (rev 100436) @@ -66,7 +66,8 @@ if (CommonLevels.INSTANCE.equals(scope.getScopeLevel()) == false) throw new IllegalArgumentException("Not an instance scope: " + scope); - MemoryMetaDataLoader loader = new MemoryMetaDataLoader(new ScopeKey(scope)); + ScopeKey key = new ScopeKey(scope); + MemoryMetaDataLoader loader = new MemoryMetaDataLoader(key.getOptimizedKey()); repository.addMetaDataRetrieval(loader); // remember loader Object qualifier = scope.getQualifier(); Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 19:54:41 UTC (rev 100435) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 20:08:46 UTC (rev 100436) @@ -23,14 +23,15 @@ //$Id: NativeCodeActivatorA.java 99304 2010-01-12 17:29:06Z thomas.diesler(a)jboss.com $ +import java.io.File; +import java.util.HashMap; +import java.util.Map; + import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; -import java.util.HashMap; -import java.util.Map; - public class NativeCodeActivatorA implements BundleActivator { private static Map<String, String> osAliases = new HashMap<String, String>(); @@ -90,7 +91,7 @@ if ("".equals(suffix)) System.err.println("No such OS mapped to alias: " + os); - String substr = "osgi-store/bundle-" + bundleid + "/" + suffix; + String substr = "osgi-store" + File.separator + "bundle-" + bundleid + File.separator + suffix; if (exmsg.indexOf(substr) < 0) throw new UnsatisfiedLinkError("Cannot find '" + substr + "' in '" + exmsg + "'"); } Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 19:54:41 UTC (rev 100435) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 20:08:46 UTC (rev 100436) @@ -7,6 +7,7 @@ macosx_x86/libNative.jnilib; osname="mac os x"; processor=x86_64, \ macosx_x86/libNative.jnilib; osname="mac os x"; processor=ppc, \ windows_x86/Native.dll; osname=Win32; processor=x86, \ + windows_x86/Native.dll; osname=WindowsXP; processor=x86, \ windows_x86/Native.dll; osname=Windows7; processor=amd64 Include-Resource: libs