harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r958712 - in /harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments: ./ META-INF/ src/ src/org/apache/harmony/eclipse/jdt/launching/environments/
Date Mon, 28 Jun 2010 20:34:13 GMT
Author: tellison
Date: Mon Jun 28 20:34:13 2010
New Revision: 958712

URL: http://svn.apache.org/viewvc?rev=958712&view=rev
Log:
Update build spec.
Enhance package list for Harmony Select 6.0, and give the list a meaningful name.
Remove its similarity to 1.5 SE.

Added:
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0
      - copied, changed from r793904, harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0.properties
      - copied, changed from r793904, harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0.properties
Removed:
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0.properties
Modified:
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/META-INF/MANIFEST.MF
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/build.properties
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/AccessRuleParticipant.java
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/Activator.java
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java

Modified: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/META-INF/MANIFEST.MF?rev=958712&r1=958711&r2=958712&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/META-INF/MANIFEST.MF
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/META-INF/MANIFEST.MF
Mon Jun 28 20:34:13 2010
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Harmony Environments
 Bundle-SymbolicName: org.apache.harmony.eclipse.jdt.launching.environments;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.4
 Bundle-Activator: org.apache.harmony.eclipse.jdt.launching.environments.Activator
 Bundle-Vendor: Apache Software Foundation
 Require-Bundle: org.eclipse.core.runtime,

Modified: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/build.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/build.properties?rev=958712&r1=958711&r2=958712&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/build.properties
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/build.properties
Mon Jun 28 20:34:13 2010
@@ -2,4 +2,10 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               plugin.xml,\
+               bin/
+src.includes = src/,\
+               META-INF/,\
+               bin/,\
+               build.properties,\
                plugin.xml

Copied: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0
(from r793904, harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0)
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0?p2=harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0&p1=harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0&r1=793904&r2=958712&rev=958712&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0
Mon Jun 28 20:34:13 2010
@@ -17,10 +17,20 @@
 
 # Harmony-Select-1.0 package definition
 
-#annotation
+#activation
+javax.activation
+
+#annotation & JSR269
 java.lang.annotation
+java.lang.annotation.processing
+javax.annotation
+javax.annotation.processing
+javax.lang.model
+javax.lang.model.element
+javax.lang.model.type
+javax.lang.model.util 
 
-#archive
+#archive & Pack200
 java.util.jar
 java.util.zip
 
@@ -98,6 +108,11 @@ java.rmi.dgc
 java.rmi.registry
 java.rmi.server
 javax.activity
+javax.rmi
+javax.rmi.ssl
+
+#script
+javax.script
 
 #security
 java.security
@@ -107,6 +122,9 @@ java.security.interfaces
 java.security.spec
 javax.security.cert
 
+#tools
+javax.tools
+
 #sql
 java.sql
 javax.sql
@@ -129,16 +147,22 @@ javax.management.modelmbean
 javax.management.monitor
 javax.management.openmbean
 javax.management.relation
+javax.management.remote
+javax.management.remote.rmi
 javax.management.timer
 
-#xml
+#xml-jaxp & xml-stax
 javax.xml
 javax.xml.datatype
 javax.xml.namespace
 javax.xml.parsers
+javax.xml.stream
+javax.xml.stream.events
+javax.xml.stream.util
 javax.xml.transform
 javax.xml.transform.dom
 javax.xml.transform.sax
+javax.xml.transform.stax
 javax.xml.transform.stream
 javax.xml.validation
 javax.xml.xpath
@@ -146,6 +170,35 @@ org.w3c.dom
 org.w3c.dom.bootstrap
 org.w3c.dom.events
 org.w3c.dom.ls
+org.w3c.dom.ranges
+org.w3c.dom.traversal
 org.xml.sax
 org.xml.sax.ext
 org.xml.sax.helpers
+
+#xml-jaxb
+javax.xml.bind
+javax.xml.bind.annotation
+javax.xml.bind.annotation.adapters
+javax.xml.bind.attachment
+javax.xml.bind.helpers
+javax.xml.bind.util
+
+#xml-jaxws
+javax.jws
+javax.jws.soap
+javax.xml.ws
+javax.xml.ws.handler
+javax.xml.ws.handler.soap
+javax.xml.ws.http
+javax.xml.ws.soap
+javax.xml.ws.spi
+javax.xml.ws.wsaddressing
+
+#xml-saaj
+javax.xml.soap
+
+#AWT data_transfer
+java.awt.datatransfer.DataFlavor
+java.awt.datatransfer.MimeType
+java.awt.datatransfer.Transferable

Copied: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0.properties
(from r793904, harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0.properties)
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0.properties?p2=harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0.properties&p1=harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0.properties&r1=793904&r2=958712&rev=958712&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-1.0.properties
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/Harmony-Select-6.0.properties
Mon Jun 28 20:34:13 2010
@@ -1 +1 @@
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6

Modified: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/AccessRuleParticipant.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/AccessRuleParticipant.java?rev=958712&r1=958711&r2=958712&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/AccessRuleParticipant.java
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/AccessRuleParticipant.java
Mon Jun 28 20:34:13 2010
@@ -84,7 +84,7 @@ public class AccessRuleParticipant imple
      * Ignores blank lines and lines that start with a #. 
      */
     private String[] getPackages() throws IOException {
-        InputStream is = this.getClass().getResourceAsStream("/Harmony-Select-1.0");
+        InputStream is = this.getClass().getResourceAsStream("/Harmony-Select-6.0");
         BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
 
         ArrayList<String> pkgs = new ArrayList<String>(50);

Modified: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/Activator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/Activator.java?rev=958712&r1=958711&r2=958712&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/Activator.java
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/Activator.java
Mon Jun 28 20:34:13 2010
@@ -18,7 +18,6 @@
 package org.apache.harmony.eclipse.jdt.launching.environments;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 import org.osgi.framework.BundleContext;

Modified: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java?rev=958712&r1=958711&r2=958712&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java
Mon Jun 28 20:34:13 2010
@@ -54,13 +54,11 @@ public class ExecutionEnvironmentAnalyze
         }
 
         // Select is a subset of SE runtimes that are 1.5 or above
-        boolean perfectMatch = javaVersion.startsWith("Harmony-Select-1.0");
-        if (perfectMatch || javaVersion.startsWith("1.7")
-                || javaVersion.startsWith("1.6") || javaVersion.startsWith("1.5")) {
+        boolean perfectMatch = javaVersion.startsWith("Harmony-Select-6.0");
+        if (perfectMatch || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.6"))
{
 
-            IExecutionEnvironmentsManager manager = JavaRuntime
-                    .getExecutionEnvironmentsManager();
-            IExecutionEnvironment env = manager.getEnvironment("Harmony-Select-1.0");
+            IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager();
+            IExecutionEnvironment env = manager.getEnvironment("Harmony-Select-6.0");
             if (env != null) {
                 CompatibleEnvironment[] result = new CompatibleEnvironment[1];
                 // SE is not a perfect match



Mime
View raw message