harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r721077 [12/12] - in /harmony/enhanced/classlib/branches/java6: ./ depends/files/ depends/jars/ depends/manifests/asm-3.1/ depends/manifests/asm-3.1/META-INF/ depends/manifests/bcel-5.2/ make/ modules/accessibility/ modules/accessibility/sr...
Date Thu, 27 Nov 2008 05:10:42 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/security/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/.classpath Wed Nov 26 21:10:32
2008
@@ -9,6 +9,6 @@
 	<classpathentry kind="src" path="src/test/api/java"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Provider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Provider.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Provider.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Provider.java
Wed Nov 26 21:10:32 2008
@@ -529,7 +529,7 @@
         if (k.startsWith("Alg.Alias.")) { // Alg.Alias.<crypto_service>.<aliasName>=<stanbdardName>
//$NON-NLS-1$
             String aliasName;
             String service_alias = k.substring(10);
-            i = service_alias.indexOf("."); //$NON-NLS-1$
+            i = service_alias.indexOf('.');
             serviceName = service_alias.substring(0, i);
             aliasName = service_alias.substring(i + 1);
             if (propertyAliasTable != null) {
@@ -547,12 +547,12 @@
             }
             return;
         }
-        int j = k.indexOf("."); //$NON-NLS-1$
+        int j = k.indexOf('.');
         if (j == -1) { // unknown format
             return;
         }
 
-        i = k.indexOf(" "); //$NON-NLS-1$
+        i = k.indexOf(' ');
         if (i == -1) { // <crypto_service>.<algorithm_or_type>=<className>
             serviceName = k.substring(0, j);
             algorithm = k.substring(j + 1);
@@ -610,7 +610,7 @@
             if (key.startsWith("Alg.Alias.")) { // Alg.Alias.<crypto_service>.<aliasName>=<stanbdardName>
//$NON-NLS-1$
                 String aliasName;
                 String service_alias = key.substring(10);
-                i = service_alias.indexOf("."); //$NON-NLS-1$
+                i = service_alias.indexOf('.');
                 serviceName = service_alias.substring(0, i);
                 aliasName = service_alias.substring(i + 1);
                 algorithm = value;
@@ -647,11 +647,11 @@
                 }
                 continue;
             }
-            int j = key.indexOf("."); //$NON-NLS-1$
+            int j = key.indexOf('.');
             if (j == -1) { // unknown format
                 continue;
             }
-            i = key.indexOf(" "); //$NON-NLS-1$
+            i = key.indexOf(' ');
             if (i == -1) { // <crypto_service>.<algorithm_or_type>=<className>
                 serviceName = key.substring(0, j);
                 algorithm = key.substring(j + 1);

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java
Wed Nov 26 21:10:32 2008
@@ -259,7 +259,7 @@
                     Messages.getString("security.2B")); //$NON-NLS-1$
         }
         HashMap<String, String> hm = new HashMap<String, String>();
-        int i = filter.indexOf(":"); //$NON-NLS-1$
+        int i = filter.indexOf(':');
         if ((i == filter.length() - 1) || (i == 0)) {
             throw new InvalidParameterException(
                     Messages.getString("security.2B")); //$NON-NLS-1$
@@ -291,8 +291,8 @@
             String key = (String) entry.getKey();
             String val = (String) entry.getValue();
             String attribute = null;
-            int i = key.indexOf(" "); //$NON-NLS-1$
-            int j = key.indexOf("."); //$NON-NLS-1$
+            int i = key.indexOf(' ');
+            int j = key.indexOf('.');
             if (j == -1) {
                 throw new InvalidParameterException(
                         Messages.getString("security.2B")); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
Wed Nov 26 21:10:32 2008
@@ -52,53 +52,51 @@
 	 * @tests java.security.CodeSource#hashCode()
 	 */
 	public void test_hashCode() throws Exception {
-       		URL url = new java.net.URL("file:///test");
-       		CodeSource cs = new CodeSource(url, (Certificate[]) null);
-       		assertTrue("Did not get expected hashCode!", cs.hashCode() == url
-       				.hashCode());
-	}
+        URL url = new java.net.URL("file:///test");
+        CodeSource cs = new CodeSource(url, (Certificate[]) null);
+        assertEquals("Did not get expected hashCode!", cs.hashCode(), url
+                .hashCode());
+    }
 
 	/**
 	 * @tests java.security.CodeSource#getCertificates()
 	 */
 	public void test_getCertificates() throws Exception {
-       		CodeSource cs = new CodeSource(new java.net.URL("file:///test"),
-       				(Certificate[]) null);
-       		assertNull("Should have gotten null certificate list.", cs
-       				.getCertificates());
-	}
+        CodeSource cs = new CodeSource(new java.net.URL("file:///test"),
+                (Certificate[]) null);
+        assertNull("Should have gotten null certificate list.", cs
+                .getCertificates());
+    }
 
 	/**
 	 * @tests java.security.CodeSource#getLocation()
 	 */
 	public void test_getLocation() throws Exception {
 		// Test for method java.net.URL java.security.CodeSource.getLocation()
-       		CodeSource cs = new CodeSource(new java.net.URL("file:///test"),
-       				(Certificate[]) null);
-       		assertEquals("Did not get expected location!", "file:/test", cs.getLocation()
-       				.toString());
-	}
+        CodeSource cs = new CodeSource(new java.net.URL("file:///test"),
+                (Certificate[]) null);
+        assertEquals("Did not get expected location!", "file:/test", cs
+                .getLocation().toString());
+        assertNotNull("Host should not be null", cs.getLocation().getHost());
+    }
 
 	/**
 	 * @tests java.security.CodeSource#implies(java.security.CodeSource)
 	 */
 	public void test_impliesLjava_security_CodeSource() throws Exception {
 		// Test for method boolean
-		// java.security.CodeSource.implies(java.security.CodeSource)
-       		CodeSource cs1 = new CodeSource(new URL("file:/d:/somedir"),
-       				(Certificate[]) null);
-       		CodeSource cs2 = new CodeSource(new URL("file:/d:/somedir/"),
-       				(Certificate[]) null);
-       		assertTrue("Does not add /", cs1.implies(cs2));
-
-
-
-       		cs1 = new CodeSource(new URL("file", null, -1,
-       				"/d:/somedir/"), (Certificate[]) null);
-       		cs2 = new CodeSource(new URL("file:/d:/somedir/"),
-       				(Certificate[]) null);
-       		assertTrue("null host should imply host", cs1.implies(cs2));
-       		assertTrue("host should not imply null host", !cs2.implies(cs1));
+        // java.security.CodeSource.implies(java.security.CodeSource)
+        CodeSource cs1 = new CodeSource(new URL("file:/d:/somedir"),
+                (Certificate[]) null);
+        CodeSource cs2 = new CodeSource(new URL("file:/d:/somedir/"),
+                (Certificate[]) null);
+        assertTrue("Does not add /", cs1.implies(cs2));
+
+        cs1 = new CodeSource(new URL("file", null, -1, "/d:/somedir/"),
+                (Certificate[]) null);
+        cs2 = new CodeSource(new URL("file:/d:/somedir/"), (Certificate[]) null);
+        assertTrue("null host should imply host", cs1.implies(cs2));
+        assertFalse("host should not imply null host", cs2.implies(cs1));
 	}
 
 }
\ No newline at end of file

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java
Wed Nov 26 21:10:32 2008
@@ -66,7 +66,7 @@
 				if (isAlias(key)) {
 					String aliasVal = key.substring("ALG.ALIAS.".length());
 					String aliasKey = aliasVal.substring(0, aliasVal
-							.indexOf(".") + 1)
+							.indexOf('.') + 1)
 							+ entry.getValue();
 					// Skip over nonsense alias declarations where alias and
 					// aliased are identical. Such entries can occur.
@@ -165,7 +165,7 @@
 				}
 
 				if (filterString != null) {
-					if (filterString.indexOf(" ") == -1) {
+					if (filterString.indexOf(' ') == -1) {
 						// Is this filter string in the keys of the
 						// current provider ?
 						if (!allProviderKeys.contains(filterString)) {
@@ -334,4 +334,4 @@
 			Security.removeProvider(entrust.getName());
 		}
 	}
-}
\ No newline at end of file
+}

Modified: harmony/enhanced/classlib/branches/java6/modules/sound/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sound/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sound/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sound/.classpath Wed Nov 26 21:10:32
2008
@@ -3,6 +3,6 @@
 	<classpathentry output="bin/main" kind="src" path="src/main/java"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/.classpath Wed Nov 26 21:10:32 2008
@@ -4,6 +4,6 @@
 	<classpathentry path="src/test/java" kind="src" output="bin/test"/>
 	<classpathentry path="src/test/resources"  kind="src" output="bin/test"/>
 	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
-	<classpathentry path="JUNIT_HOME/junit.jar" kind="var" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry path="bin/main" kind="output"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/META-INF/MANIFEST.MF?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/META-INF/MANIFEST.MF Wed Nov 26 21:10:32
2008
@@ -25,14 +25,14 @@
  java.util.logging,
  java.util.zip;resolution:=optional,
  javax.naming,
- javax.xml.parsers,
+ javax.xml.parsers;resolution:=optional,
  javax.xml.transform,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util,
  org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
- org.w3c.dom,
+ org.w3c.dom;resolution:=optional,
  org.xml.sax,
  org.xml.sax.helpers,
  tests.support;hy_usage=test;resolution:=optional

Modified: harmony/enhanced/classlib/branches/java6/modules/suncompat/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/suncompat/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/suncompat/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/suncompat/.classpath Wed Nov 26 21:10:32
2008
@@ -3,6 +3,6 @@
 	<classpathentry path="src/main/java" kind="src" output="bin/main"/>
 	<classpathentry path="src/test/java" kind="src" output="bin/test"/>
 	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
-	<classpathentry path="JUNIT_HOME/junit.jar" kind="var" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry path="bin/main" kind="output"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/.classpath Wed Nov 26 21:10:32
2008
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="bin/main/linux" path="src/main/java/unix"/>
 	<classpathentry kind="src" output="bin/test/injected" path="src/test/api/java.injected"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path=""/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java
Wed Nov 26 21:10:32 2008
@@ -207,7 +207,7 @@
     /**
      * The serialization UID value.
      */
-    static final long serialVersionUID = -1130825523866321257L;
+    private static final long serialVersionUID = -1130825523866321257L;
     
     /**
      * The type of the content model. It should be '*', '+', '?', '|', '&', ','

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java
Wed Nov 26 21:10:32 2008
@@ -387,7 +387,7 @@
     private String getKeymapName(final JTextComponent c) {
         BasicTextUI ui = (BasicTextUI) jta.getUI();
         String className = ui.getClass().getName();
-        int start = className.lastIndexOf(".");
+        int start = className.lastIndexOf('.');
         int end = className.length();
         String keymapName = className.substring(start + 1, end);
         return keymapName;

Modified: harmony/enhanced/classlib/branches/java6/modules/text/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/text/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/text/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/text/.classpath Wed Nov 26 21:10:32 2008
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" output="bin/test" path="src/test/java"/>
 	<classpathentry kind="src" output="bin/test" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/.classpath Wed Nov 26 21:10:32
2008
@@ -8,6 +8,6 @@
 	<classpathentry kind="src" output="bin/test/api" path="src/test/api/java"/>
 	<classpathentry kind="src" output="bin/test/api" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
Wed Nov 26 21:10:32 2008
@@ -157,7 +157,7 @@
      */
     protected File getDataFile(int index) {
         String name = this.getClass().getName();
-        int dot = name.lastIndexOf(".");
+        int dot = name.lastIndexOf('.');
         String path = name.substring(0, dot).replace('.', File.separatorChar);
         if (outputPath != null && outputPath.length() != 0) {
             path = outputPath + File.separator + path;

Modified: harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_Exec.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_Exec.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_Exec.java
(original)
+++ harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_Exec.java
Wed Nov 26 21:10:32 2008
@@ -193,7 +193,21 @@
         synchronized (proc) {
 			errThread.start();
 			// wait for errThread to start
-			proc.wait();
+			int count = 0;
+			boolean isFinished = false;
+			while(!isFinished) {
+			    try {
+			        proc.wait();
+			        isFinished = true;
+			    } catch (InterruptedException e) {
+			        if(++count == 2) {
+			            throw e;
+			        }
+			    }
+			}
+			if(count > 0) {
+			    Thread.currentThread().interrupt();
+			}
 		}
 
         return new Object[] { proc, errBuf };



Mime
View raw message