Upgrade to Equinox 3.5

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@794551 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 175 insertions, 24 deletions

diff --git a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java
index f8566b835b..9375153a7e 100644
--- a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java
+++ b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleUtil.java
@@ -28,15 +28,19 @@ import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE;
 import static org.osgi.framework.Constants.EXPORT_PACKAGE;
 import static org.osgi.framework.Constants.IMPORT_PACKAGE;
 
+import java.io.BufferedInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
@@ -45,6 +49,9 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.eclipse.osgi.framework.internal.core.Constants;
+import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
+import org.eclipse.osgi.util.ManifestElement;
 import org.osgi.framework.Version;
 
 /**
@@ -445,4 +452,152 @@ final class BundleUtil {
         return version;
     }
 
+    private static String J2SE = "J2SE-";
+    private static String JAVASE = "JavaSE-";
+    private static String PROFILE_EXT = ".profile";
+    private static URL findInSystemBundle(String entry) {
+        ClassLoader loader = BundleUtil.class.getClassLoader();
+        return loader == null ? ClassLoader.getSystemResource(entry) : loader.getResource(entry);
+    }
+
+    private static URL findNextBestProfile(String javaEdition, Version javaVersion) {
+        URL result = null;
+        int minor = javaVersion.getMinor();
+        do {
+            result = findInSystemBundle(javaEdition + javaVersion.getMajor() + "." + minor + PROFILE_EXT);
+            minor = minor - 1;
+        } while (result == null && minor > 0);
+        return result;
+    }
+
+    private static Properties findVMProfile(Properties properties) {
+        Properties result = new Properties();
+        // Find the VM profile name using J2ME properties
+        String j2meConfig = properties.getProperty(Constants.J2ME_MICROEDITION_CONFIGURATION);
+        String j2meProfiles = properties.getProperty(Constants.J2ME_MICROEDITION_PROFILES);
+        String vmProfile = null;
+        String javaEdition = null;
+        Version javaVersion = null;
+        if (j2meConfig != null && j2meConfig.length() > 0 && j2meProfiles != null && j2meProfiles.length() > 0) {
+            // save the vmProfile based off of the config and profile
+            // use the last profile; assuming that is the highest one
+            String[] j2meProfileList = ManifestElement.getArrayFromList(j2meProfiles, " ");
+            if (j2meProfileList != null && j2meProfileList.length > 0)
+                vmProfile = j2meConfig + '_' + j2meProfileList[j2meProfileList.length - 1];
+        } else {
+            // No J2ME properties; use J2SE properties
+            // Note that the CDC spec appears not to require VM implementations to set the
+            // javax.microedition properties!!  So we will try to fall back to the
+            // java.specification.name property, but this is pretty ridiculous!!
+            String javaSpecVersion = properties.getProperty("java.specification.version");
+            // set the profile and EE based off of the java.specification.version
+            // TODO We assume J2ME Foundation and J2SE here.  need to support other profiles J2EE ...
+            if (javaSpecVersion != null) {
+                StringTokenizer st = new StringTokenizer(javaSpecVersion, " _-");
+                javaSpecVersion = st.nextToken();
+                String javaSpecName = properties.getProperty("java.specification.name");
+                if ("J2ME Foundation Specification".equals(javaSpecName))
+                    vmProfile = "CDC-" + javaSpecVersion + "_Foundation-" + javaSpecVersion;  //$NON-NLS-2$
+                else {
+                    // look for JavaSE if 1.6 or greater; otherwise look for J2SE
+                    Version v16 = new Version("1.6");
+                    javaEdition = J2SE;
+                    try {
+                        javaVersion = new Version(javaSpecVersion);
+                        if (v16.compareTo(javaVersion) <= 0)
+                            javaEdition = JAVASE;
+                    } catch (IllegalArgumentException e) {
+                        // do nothing
+                    }
+                    vmProfile = javaEdition + javaSpecVersion;
+                }
+            }
+        }
+        URL url = null;
+        // check for the java profile property for a url
+        String propJavaProfile = FrameworkProperties.getProperty(Constants.OSGI_JAVA_PROFILE);
+        if (propJavaProfile != null)
+            try {
+                // we assume a URL
+                url = new URL(propJavaProfile);
+            } catch (MalformedURLException e1) {
+                // try using a relative path in the system bundle
+                url = findInSystemBundle(propJavaProfile);
+            }
+        if (url == null && vmProfile != null) {
+            // look for a profile in the system bundle based on the vm profile
+            String javaProfile = vmProfile + PROFILE_EXT;
+            url = findInSystemBundle(javaProfile);
+            if (url == null)
+                url = getNextBestProfile(javaEdition, javaVersion);
+        }
+        if (url == null)
+            // the profile url is still null then use the osgi min profile in OSGi by default
+            url = findInSystemBundle("OSGi_Minimum-1.1.profile");
+        if (url != null) {
+            InputStream in = null;
+            try {
+                in = url.openStream();
+                result.load(new BufferedInputStream(in));
+            } catch (IOException e) {
+                // TODO consider logging ...
+            } finally {
+                if (in != null)
+                    try {
+                        in.close();
+                    } catch (IOException ee) {
+                        // do nothing
+                    }
+            }
+        }
+        // set the profile name if it does not provide one
+        if (result.getProperty(Constants.OSGI_JAVA_PROFILE_NAME) == null)
+            if (vmProfile != null)
+                result.put(Constants.OSGI_JAVA_PROFILE_NAME, vmProfile.replace('_', '/'));
+            else
+                // last resort; default to the absolute minimum profile name for the framework
+                result.put(Constants.OSGI_JAVA_PROFILE_NAME, "OSGi/Minimum-1.1");
+        return result;
+    }
+
+    public static void loadVMProfile(Properties properties) {
+        Properties profileProps = findVMProfile(properties);
+        String systemExports = properties.getProperty(Constants.OSGI_FRAMEWORK_SYSTEM_PACKAGES);
+        // set the system exports property using the vm profile; only if the property is not already set
+        if (systemExports == null) {
+            systemExports = profileProps.getProperty(Constants.OSGI_FRAMEWORK_SYSTEM_PACKAGES);
+            if (systemExports != null)
+                properties.put(Constants.OSGI_FRAMEWORK_SYSTEM_PACKAGES, systemExports);
+        }
+        // set the org.osgi.framework.bootdelegation property according to the java profile
+        String type = properties.getProperty(Constants.OSGI_JAVA_PROFILE_BOOTDELEGATION); // a null value means ignore
+        String profileBootDelegation = profileProps.getProperty(Constants.OSGI_BOOTDELEGATION);
+        if (Constants.OSGI_BOOTDELEGATION_OVERRIDE.equals(type)) {
+            if (profileBootDelegation == null)
+                properties.remove(Constants.OSGI_BOOTDELEGATION); // override with a null value
+            else
+                properties.put(Constants.OSGI_BOOTDELEGATION, profileBootDelegation); // override with the profile value
+        } else if (Constants.OSGI_BOOTDELEGATION_NONE.equals(type))
+            properties.remove(Constants.OSGI_BOOTDELEGATION); // remove the bootdelegation property in case it was set
+        // set the org.osgi.framework.executionenvironment property according to the java profile
+        if (properties.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT) == null) {
+            // get the ee from the java profile; if no ee is defined then try the java profile name
+            String ee =
+                profileProps.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, profileProps
+                    .getProperty(Constants.OSGI_JAVA_PROFILE_NAME));
+            if (ee != null)
+                properties.put(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, ee);
+        }
+    }
+
+    private static URL getNextBestProfile(String javaEdition, Version javaVersion) {
+        if (javaVersion == null || (javaEdition != J2SE && javaEdition != JAVASE))
+            return null; // we cannot automatically choose the next best profile unless this is a J2SE or JavaSE vm
+        URL bestProfile = findNextBestProfile(javaEdition, javaVersion);
+        if (bestProfile == null && javaEdition == JAVASE)
+            // if this is a JavaSE VM then search for a lower J2SE profile
+            bestProfile = findNextBestProfile(J2SE, javaVersion);
+        return bestProfile;
+    }
+
 }
diff --git a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/plugin/eclipse/EclipseClasspathWriter.java b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/plugin/eclipse/EclipseClasspathWriter.java
index abdf75ae96..3fec54ba35 100644
--- a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/plugin/eclipse/EclipseClasspathWriter.java
+++ b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/plugin/eclipse/EclipseClasspathWriter.java
@@ -32,13 +32,10 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.eclipse.BuildCommand;
 import org.apache.maven.plugin.eclipse.Constants;
 import org.apache.maven.plugin.eclipse.EclipseSourceDir;
 import org.apache.maven.plugin.eclipse.Messages;
 import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
-import org.apache.maven.plugin.eclipse.writers.EclipseAntExternalLaunchConfigurationWriter;
-import org.apache.maven.plugin.eclipse.writers.EclipseLaunchConfigurationWriter;
 import org.apache.maven.plugin.ide.IdeDependency;
 import org.apache.maven.plugin.ide.IdeUtils;
 import org.codehaus.plexus.util.IOUtil;
@@ -280,7 +277,7 @@ public class EclipseClasspathWriter
 
         }
 
-        /* --------------- Commented out by rfeng
+        /*
         // handle the special sources.
         if ( !specialSources.isEmpty() )
         {
diff --git a/maven-plugins/trunk/maven-eclipse-compiler/pom.xml b/maven-plugins/trunk/maven-eclipse-compiler/pom.xml
index dfa76bd679..4e98c3e12a 100644
--- a/maven-plugins/trunk/maven-eclipse-compiler/pom.xml
+++ b/maven-plugins/trunk/maven-eclipse-compiler/pom.xml
@@ -232,7 +232,7 @@
         <dependency>

             <groupId>org.eclipse</groupId>

             <artifactId>osgi</artifactId>

-            <version>3.4.0-v20080605-1900</version>

+            <version>3.5.0-v20090520</version>

             <scope>compile</scope>

         </dependency>

 

diff --git a/maven-plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java b/maven-plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java
index c77991041c..5722ef832a 100644
--- a/maven-plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java
+++ b/maven-plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java
@@ -471,23 +471,23 @@ public final class BundleUtil {
 
     public static void loadVMProfile(Properties properties) {
         Properties profileProps = findVMProfile(properties);
-        String systemExports = properties.getProperty(Constants.OSGI_FRAMEWORK_SYSTEM_PACKAGES);
+        String systemExports = properties.getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES);
         // set the system exports property using the vm profile; only if the property is not already set
         if (systemExports == null) {
-            systemExports = profileProps.getProperty(Constants.OSGI_FRAMEWORK_SYSTEM_PACKAGES);
+            systemExports = profileProps.getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES);
             if (systemExports != null)
-                properties.put(Constants.OSGI_FRAMEWORK_SYSTEM_PACKAGES, systemExports);
+                properties.put(Constants.FRAMEWORK_SYSTEMPACKAGES, systemExports);
         }
         // set the org.osgi.framework.bootdelegation property according to the java profile
         String type = properties.getProperty(Constants.OSGI_JAVA_PROFILE_BOOTDELEGATION); // a null value means ignore
-        String profileBootDelegation = profileProps.getProperty(Constants.OSGI_BOOTDELEGATION);
+        String profileBootDelegation = profileProps.getProperty(Constants.FRAMEWORK_BOOTDELEGATION);
         if (Constants.OSGI_BOOTDELEGATION_OVERRIDE.equals(type)) {
             if (profileBootDelegation == null)
-                properties.remove(Constants.OSGI_BOOTDELEGATION); // override with a null value
+                properties.remove(Constants.FRAMEWORK_BOOTDELEGATION); // override with a null value
             else
-                properties.put(Constants.OSGI_BOOTDELEGATION, profileBootDelegation); // override with the profile value
+                properties.put(Constants.FRAMEWORK_BOOTDELEGATION, profileBootDelegation); // override with the profile value
         } else if (Constants.OSGI_BOOTDELEGATION_NONE.equals(type))
-            properties.remove(Constants.OSGI_BOOTDELEGATION); // remove the bootdelegation property in case it was set
+            properties.remove(Constants.FRAMEWORK_BOOTDELEGATION); // remove the bootdelegation property in case it was set
         // set the org.osgi.framework.executionenvironment property according to the java profile
         if (properties.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT) == null) {
             // get the ee from the java profile; if no ee is defined then try the java profile name
@@ -510,26 +510,26 @@ public final class BundleUtil {
         if (j2meConfig != null && j2meConfig.length() > 0 && j2meProfiles != null && j2meProfiles.length() > 0) {
             // save the vmProfile based off of the config and profile
             // use the last profile; assuming that is the highest one
-            String[] j2meProfileList = ManifestElement.getArrayFromList(j2meProfiles, " ");
+            String[] j2meProfileList = ManifestElement.getArrayFromList(j2meProfiles, " "); //$NON-NLS-1$
             if (j2meProfileList != null && j2meProfileList.length > 0)
                 vmProfile = j2meConfig + '_' + j2meProfileList[j2meProfileList.length - 1];
         } else {
             // No J2ME properties; use J2SE properties
             // Note that the CDC spec appears not to require VM implementations to set the
-            // javax.microedition properties!!  So we will try to fall back to the
+            // javax.microedition properties!!  So we will try to fall back to the 
             // java.specification.name property, but this is pretty ridiculous!!
-            String javaSpecVersion = properties.getProperty("java.specification.version");
+            String javaSpecVersion = properties.getProperty("java.specification.version"); //$NON-NLS-1$
             // set the profile and EE based off of the java.specification.version
             // TODO We assume J2ME Foundation and J2SE here.  need to support other profiles J2EE ...
             if (javaSpecVersion != null) {
-                StringTokenizer st = new StringTokenizer(javaSpecVersion, " _-");
+                StringTokenizer st = new StringTokenizer(javaSpecVersion, " _-"); //$NON-NLS-1$
                 javaSpecVersion = st.nextToken();
-                String javaSpecName = properties.getProperty("java.specification.name");
-                if ("J2ME Foundation Specification".equals(javaSpecName))
-                    vmProfile = "CDC-" + javaSpecVersion + "_Foundation-" + javaSpecVersion;  //$NON-NLS-2$
+                String javaSpecName = properties.getProperty("java.specification.name"); //$NON-NLS-1$
+                if ("J2ME Foundation Specification".equals(javaSpecName)) //$NON-NLS-1$
+                    vmProfile = "CDC-" + javaSpecVersion + "_Foundation-" + javaSpecVersion; //$NON-NLS-1$ //$NON-NLS-2$
                 else {
                     // look for JavaSE if 1.6 or greater; otherwise look for J2SE
-                    Version v16 = new Version("1.6");
+                    Version v16 = new Version("1.6"); //$NON-NLS-1$
                     javaEdition = J2SE;
                     try {
                         javaVersion = new Version(javaSpecVersion);
@@ -562,7 +562,7 @@ public final class BundleUtil {
         }
         if (url == null)
             // the profile url is still null then use the osgi min profile in OSGi by default
-            url = findInSystemBundle("OSGi_Minimum-1.1.profile");
+            url = findInSystemBundle("OSGi_Minimum-1.2.profile"); //$NON-NLS-1$
         if (url != null) {
             InputStream in = null;
             try {
@@ -585,7 +585,7 @@ public final class BundleUtil {
                 result.put(Constants.OSGI_JAVA_PROFILE_NAME, vmProfile.replace('_', '/'));
             else
                 // last resort; default to the absolute minimum profile name for the framework
-                result.put(Constants.OSGI_JAVA_PROFILE_NAME, "OSGi/Minimum-1.1");
+                result.put(Constants.OSGI_JAVA_PROFILE_NAME, "OSGi/Minimum-1.2"); //$NON-NLS-1$
         return result;
     }
 
@@ -603,7 +603,7 @@ public final class BundleUtil {
         URL result = null;
         int minor = javaVersion.getMinor();
         do {
-            result = findInSystemBundle(javaEdition + javaVersion.getMajor() + "." + minor + PROFILE_EXT);
+            result = findInSystemBundle(javaEdition + javaVersion.getMajor() + "." + minor + PROFILE_EXT); //$NON-NLS-1$
             minor = minor - 1;
         } while (result == null && minor > 0);
         return result;
@@ -614,5 +614,4 @@ public final class BundleUtil {
         return loader == null ? ClassLoader.getSystemResource(entry) : loader.getResource(entry);
     }
 
-
 }