harmony-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	hinde...@apache.org
Subject	svn commit: r930170 [1/2] - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/awt/src/main/native/gl/shared/ classlib/modules/imageio/src/main/native/pngencoder/shared/ classlib/modules/logging/src/main/java...
Date	Fri, 02 Apr 2010 05:58:00 GMT
Author: hindessm Date: Fri Apr 2 05:57:58 2010 New Revision: 930170 URL: http://svn.apache.org/viewvc?rev=930170&view=rev Log: Merge changes from trunk@930072. Modified: harmony/enhanced/java/branches/java6/ (props changed) harmony/enhanced/java/branches/java6/classlib/ (props changed) harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed) harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/XMLFormatter.java harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/javax/sound/midi/MidiSystem.java harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/org/apache/harmony/sound/internal/nls/messages.properties harmony/enhanced/java/branches/java6/common_resources/ (props changed) harmony/enhanced/java/branches/java6/debian/control harmony/enhanced/java/branches/java6/drlvm/ (props changed) harmony/enhanced/java/branches/java6/drlvm/make/depends.properties harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml harmony/enhanced/java/branches/java6/jdktools/ (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.classpath (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.project (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java (props changed) harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java (props changed) Propchange: harmony/enhanced/java/branches/java6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk:929253-929271 +/harmony/enhanced/java/trunk:929253-930072 /harmony/enhanced/trunk:810871-929252 Propchange: harmony/enhanced/java/branches/java6/classlib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,6 +1,6 @@ /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286 -/harmony/enhanced/java/trunk/classlib:929253-929271 +/harmony/enhanced/java/trunk/classlib:929253-930072 /harmony/enhanced/trunk/classlib:810871-929252 /harmony/enhanced/trunk/working_classlib:476396-920147 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394 Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,3 +1,3 @@ /harmony/enhanced/classlib/trunk/depends/libs:544451-926091 -/harmony/enhanced/java/trunk/classlib/depends/libs:929253-929271 -/harmony/enhanced/trunk/classlib/depends/libs:926318-929252 +/harmony/enhanced/java/trunk/classlib/depends/libs:929253-930072 +/harmony/enhanced/trunk/classlib/depends/libs:810871-929252 Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/shared/pngdecoder.c Fri Apr 2 05:57:58 2010 @@ -309,7 +309,7 @@ png_decoder_info_ptr initPng() { decoderInfo->info_ptr = png_create_info_struct(decoderInfo->png_ptr); if (!decoderInfo->info_ptr) { - png_destroy_read_struct(&decoderInfo->png_ptr, png_infopp_NULL, png_infopp_NULL); + png_destroy_read_struct(&decoderInfo->png_ptr, NULL, NULL); return NULL; } Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/shared/pngencoder.c Fri Apr 2 05:57:58 2010 @@ -264,7 +264,7 @@ png_encoder_info_ptr initPng() { encoderInfo->info_ptr = png_create_info_struct(encoderInfo->png_ptr); if (!encoderInfo->info_ptr) { - png_destroy_write_struct(&encoderInfo->png_ptr, png_infopp_NULL); + png_destroy_write_struct(&encoderInfo->png_ptr, NULL); return NULL; } Modified: harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/XMLFormatter.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/XMLFormatter.java?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/XMLFormatter.java (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/XMLFormatter.java Fri Apr 2 05:57:58 2010 @@ -19,7 +19,7 @@ package java.util.logging; import java.security.AccessController; import java.security.PrivilegedAction; -import java.text.MessageFormat; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.ResourceBundle; @@ -37,6 +37,9 @@ public class XMLFormatter extends Format private static final String indent = " "; //$NON-NLS-1$ + private static final SimpleDateFormat dataFormat = new SimpleDateFormat( + "yyyy-MM-dd hh:mm:ss"); //$NON-NLS-1$ + /** * Constructs a new {@code XMLFormatter}. / @@ -57,45 +60,61 @@ public class XMLFormatter extends Format // call a method of LogRecord to ensure not null long time = r.getMillis(); // format to date - String date = MessageFormat.format("{0, date} {0, time}", - new Object[] { new Date(time) }); + String date = dataFormat.format(new Date(time)).replace(' ', 'T'); StringBuilder sb = new StringBuilder(); - sb.append(("<record>")).append(lineSeperator); - sb.append(indent).append(("<date>")).append(date).append(("</date>")) + sb.append("<record>").append(lineSeperator); + sb.append(indent).append("<date>").append(date).append("</date>") + .append(lineSeperator); + + sb.append(indent).append("<millis>").append(time).append("</millis>") .append(lineSeperator); - sb.append(indent).append(("<millis>")).append(time).append( - ("</millis>")).append(lineSeperator); - sb.append(indent).append(("<sequence>")).append(r.getSequenceNumber()) - .append(("</sequence>")).append(lineSeperator); - if (null != r.getLoggerName()) { - sb.append(indent).append(("<logger>")).append(r.getLoggerName()) - .append(("</logger>")).append(lineSeperator); - } - sb.append(indent).append(("<level>")).append(r.getLevel().getName()) - .append(("</level>")).append(lineSeperator); - if (null != r.getSourceClassName()) { - sb.append(indent).append(("<class>")) - .append(r.getSourceClassName()).append(("</class>")) - .append(lineSeperator); - } - if (null != r.getSourceMethodName()) { - sb.append(indent).append(("<method>")).append( - r.getSourceMethodName()).append(("</method>")).append( + + sb.append(indent).append("<sequence>").append(r.getSequenceNumber()) + .append("</sequence>").append(lineSeperator); + + String content = r.getLoggerName(); + if (null != content) { + sb.append(indent).append("<logger>").append( + convertSpecialSymbol(content)).append("</logger>").append( + lineSeperator); + } + + sb.append(indent).append("<level>").append(r.getLevel().getName()) + .append("</level>").append(lineSeperator); + + content = r.getSourceClassName(); + if (null != content) { + sb.append(indent).append("<class>").append(content).append( + "</class>").append(lineSeperator); + } + + content = r.getSourceMethodName(); + if (null != content) { + sb.append(indent).append("<method>").append( + convertSpecialSymbol(content)).append("</method>").append( lineSeperator); } - sb.append(indent).append(("<thread>")).append(r.getThreadID()).append( - ("</thread>")).append(lineSeperator); + + sb.append(indent).append("<thread>").append(r.getThreadID()).append( + "</thread>").append(lineSeperator); + formatMessages(r, sb); + Object[] params; if ((params = r.getParameters()) != null) { + String elementString = null; for (Object element : params) { - sb.append(indent).append(("<param>")).append(element).append( - ("</param>")).append(lineSeperator); + elementString = element.toString(); + sb.append(indent).append("<param>").append( + convertSpecialSymbol(elementString)).append("</param>") + .append(lineSeperator); } } + formatThrowable(r, sb); - sb.append(("</record>")).append(lineSeperator); + + sb.append("</record>").append(lineSeperator); return sb.toString(); } @@ -105,6 +124,7 @@ public class XMLFormatter extends Format // to parse pattern string ResourceBundle rb = r.getResourceBundle(); String pattern = r.getMessage(); + if (null != rb && null != pattern) { String message; try { @@ -115,20 +135,26 @@ public class XMLFormatter extends Format if (message == null) { message = pattern; - sb.append(indent).append(("<message>")).append(message).append( - ("</message>")).append(lineSeperator); + sb.append(indent).append("<message>").append( + convertSpecialSymbol(message)).append("</message>") + .append(lineSeperator); } else { - sb.append(indent).append(("<message>")).append(message).append( - ("</message>")).append(lineSeperator); - sb.append(indent).append(("<key>")).append(pattern).append( - ("</key>")).append(lineSeperator); - sb.append(indent).append(("<catalog>")).append( - r.getResourceBundleName()).append(("</catalog>")) + sb.append(indent).append("<message>").append( + convertSpecialSymbol(message)).append("</message>") .append(lineSeperator); + + sb.append(indent).append("<key>").append( + convertSpecialSymbol(pattern)).append("</key>").append( + lineSeperator); + + sb.append(indent).append("<catalog>").append( + convertSpecialSymbol(r.getResourceBundleName())) + .append("</catalog>").append(lineSeperator); } } else if (null != pattern) { - sb.append(indent).append(("<message>")).append(pattern).append( - ("</message>")).append(lineSeperator); + sb.append(indent).append("<message>").append( + convertSpecialSymbol(pattern)).append("</message>").append( + lineSeperator); } else { sb.append(indent).append(("<message/>")); } @@ -139,24 +165,33 @@ public class XMLFormatter extends Format Throwable t; if ((t = r.getThrown()) != null) { sb.append(indent).append("<exception>").append(lineSeperator); - sb.append(indent).append(indent).append("<message>").append( - t.toString()).append("</message>").append(lineSeperator); - // format throwable's stack trace - StackTraceElement[] elements = t.getStackTrace(); - for (StackTraceElement e : elements) { - sb.append(indent).append(indent).append("<frame>").append( - lineSeperator); - sb.append(indent).append(indent).append(indent).append( - "<class>").append(e.getClassName()).append("</class>") - .append(lineSeperator); - sb.append(indent).append(indent).append(indent).append( - "<method>").append(e.getMethodName()).append( - "</method>").append(lineSeperator); - sb.append(indent).append(indent).append(indent) - .append("<line>").append(e.getLineNumber()).append( + { + sb.append(indent).append(indent).append("<message>").append( + convertSpecialSymbol(t.toString())) + .append("</message>").append(lineSeperator); + + // format throwable's stack trace + StackTraceElement[] elements = t.getStackTrace(); + for (StackTraceElement e : elements) { + sb.append(indent).append(indent).append("<frame>").append( + lineSeperator); + { + sb.append(indent).append(indent).append(indent).append( + "<class>").append(e.getClassName()).append( + "</class>").append(lineSeperator); + + sb.append(indent).append(indent).append(indent).append( + "<method>").append( + convertSpecialSymbol(e.getMethodName())) + .append("</method>").append(lineSeperator); + + sb.append(indent).append(indent).append(indent).append( + "<line>").append(e.getLineNumber()).append( "</line>").append(lineSeperator); - sb.append(indent).append(indent).append("</frame>").append( - lineSeperator); + } + sb.append(indent).append(indent).append("</frame>").append( + lineSeperator); + } } sb.append(indent).append("</exception>").append(lineSeperator); } @@ -185,14 +220,14 @@ public class XMLFormatter extends Format sb.append("<?xml version=\"1.0\" encoding=\"").append(encoding).append( "\" standalone=\"no\"?>").append(lineSeperator); sb.append("<!DOCTYPE log SYSTEM \"logger.dtd\">").append(lineSeperator); - sb.append(("<log>")); + sb.append("<log>").append(lineSeperator); return sb.toString(); } /* * Returns the tail string for a set of log records formatted as XML * strings. - * + * * @param h * the output handler, may be {@code null}. * @return the tail string for log records formatted as XML strings. @@ -202,6 +237,26 @@ public class XMLFormatter extends Format return "</log>"; //$NON-NLS-1$ } + private String convertSpecialSymbol(String str) { + if (str == null) { + return null; + } + StringBuilder sb = new StringBuilder(); + char[] chars = str.toCharArray(); + for (int index = 0; index < chars.length; index++) { + if ('<' == chars[index]) { + sb.append("<"); //$NON-NLS-1$ + } else if ('>' == chars[index]) { + sb.append(">"); //$NON-NLS-1$ + } else if ('&' == chars[index]) { + sb.append("&"); //$NON-NLS-1$ + } else { + sb.append(chars[index]); + } + } + return sb.toString(); + } + // use privilege code to get system property private static String getSystemProperty(final String key) { return AccessController.doPrivileged(new PrivilegedAction<String>() { Modified: harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java Fri Apr 2 05:57:58 2010 @@ -17,11 +17,18 @@ package org.apache.harmony.logging.tests.java.util.logging; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; import java.io.UnsupportedEncodingException; import java.util.ResourceBundle; +import java.util.logging.FileHandler; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; +import java.util.logging.Logger; import java.util.logging.XMLFormatter; import junit.framework.TestCase; @@ -170,7 +177,47 @@ public class XMLFormatterTest extends Te String output = formatter.format(lr); // System.out.println(formatter.getHead(handler)+output+formatter.getTail(handler)); assertTrue(output.indexOf("<message") > 0); - } + } + + public class TestFileHandlerClass { + Logger logger = Logger.getLogger(TestFileHandlerClass.class.getName()); + + public TestFileHandlerClass(String logFile) throws SecurityException, + IOException { + logger.addHandler(new FileHandler(logFile)); + LogRecord logRecord = new LogRecord(Level.INFO, "message:<init>&"); + logRecord.setLoggerName("<init>&"); + logRecord.setThrown(new Exception("<init>&")); + logRecord.setParameters(new String[] { "<init>&" }); + logger.log(logRecord); + } + } + + public void test_TestFileHandlerClass_constructor() throws Exception { + File logFile = new File(System.getProperty("user.home"), + "TestFileHandlerClass.log"); + logFile.deleteOnExit(); + + PrintStream out = System.out; + PrintStream err = System.err; + try { + System.setOut(null); + System.setErr(null); + new TestFileHandlerClass(logFile.getCanonicalPath()); + BufferedReader br = new BufferedReader(new FileReader(logFile)); + String line = null; + + while ((line = br.readLine()) != null) { + if (line.contains("<init>&")) { + fail("should convert <init> to <init>"); + break; + } + } + } finally { + System.setOut(out); + System.setErr(err); + } + } public static class MockHandler extends Handler { public void close() { Modified: harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/javax/sound/midi/MidiSystem.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/javax/sound/midi/MidiSystem.java?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/javax/sound/midi/MidiSystem.java (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/javax/sound/midi/MidiSystem.java Fri Apr 2 05:57:58 2010 @@ -33,6 +33,7 @@ import javax.sound.midi.spi.MidiFileWrit import javax.sound.midi.spi.SoundbankReader; import org.apache.harmony.sound.utils.ProviderService; +import org.apache.harmony.sound.internal.nls.Messages; public class MidiSystem { // This class has no public constructor @@ -93,7 +94,7 @@ public class MidiSystem { /* * if we can't find device with requested info, we throw out IllegalArgumentException / - throw new IllegalArgumentException("Requested device not installed: " + info.getName()); + throw new IllegalArgumentException(Messages.getString("sound.1F", info.getName())); } public static MidiDevice.Info[] getMidiDeviceInfo() { @@ -130,7 +131,7 @@ public class MidiSystem { appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.19")); } / * It's not determine what provider for this service I should to use, and so @@ -152,7 +153,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.19")); } / * It's not determine what provider for this service I should to use, and so @@ -174,7 +175,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.19")); } / * It's not determine what provider for this service I should to use, and so @@ -195,7 +196,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileWriterProviders on your system!!!"); + throw new Error(Messages.getString("sound.1A")); } / * It's not determine what provider for this service I should to use, and so @@ -216,7 +217,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileWriterProviders on your system!!!"); + throw new Error(Messages.getString("sound.1A")); } / * It's not determine what provider for this service I should to use, and so @@ -297,7 +298,7 @@ public class MidiSystem { /* * if we don't find anyway, we throw out MidiUnavailableException / - throw new MidiUnavailableException("There are no Receivers installed on your system!"); + throw new MidiUnavailableException(Messages.getString("sound.1B")); } public static Sequence getSequence(File file) throws InvalidMidiDataException, IOException { @@ -312,7 +313,7 @@ public class MidiSystem { appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.19")); } / * It's not determine what provider for this service I should to use, and so @@ -334,7 +335,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.19")); } / * It's not determine what provider for this service I should to use, and so @@ -355,7 +356,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.19")); } / * It's not determine what provider for this service I should to use, and so @@ -508,7 +509,7 @@ public class MidiSystem { /* * if we don't find anyway, we throw out MidiUnavailableException / - throw new MidiUnavailableException("There are no Synthesizers installed on your system!"); + throw new MidiUnavailableException(Messages.getString("sound.1C")); } public static Soundbank getSoundbank(File file) throws InvalidMidiDataException, @@ -524,7 +525,7 @@ public class MidiSystem { appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no SoundbankReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.1D")); } / * It's not determine what provider for this service I should to use, and so @@ -545,7 +546,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no SoundbankReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.1D")); } / * It's not determine what provider for this service I should to use, and so @@ -566,7 +567,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no SoundbankReaderProviders on your system!!!"); + throw new Error(Messages.getString("sound.1D")); } / * It's not determine what provider for this service I should to use, and so @@ -648,7 +649,7 @@ public class MidiSystem { /* * if we don't find anyway, we throw out MidiUnavailableException / - throw new MidiUnavailableException("There are no Synthesizers installed on your system!"); + throw new MidiUnavailableException(Messages.getString("sound.1C")); } public static Transmitter getTransmitter() throws MidiUnavailableException { @@ -723,7 +724,7 @@ public class MidiSystem { / * if we don't find anyway, we throw out MidiUnavailableException / - throw new MidiUnavailableException("There are no Transmitters installed on your system!"); + throw new MidiUnavailableException(Messages.getString("sound.1E")); } public static boolean isFileTypeSupported(int fileType) { @@ -739,7 +740,7 @@ public class MidiSystem { appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileWriterProviders on your system!!!"); + throw new Error(Messages.getString("sound.1A")); } / * It's not determine what provider for this service I should to use, and so @@ -760,7 +761,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileWriterProviders on your system!!!"); + throw new Error(Messages.getString("sound.1A")); } / * It's not determine what provider for this service I should to use, and so @@ -781,7 +782,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileWriterProviders on your system!!!"); + throw new Error(Messages.getString("sound.1A")); } / * It's not determine what provider for this service I should to use, and so @@ -802,7 +803,7 @@ public class MidiSystem { * appropriate providers... * Maybe here is should be MidiUnavailableException / - throw new Error("There is no MidiFileWriterProviders on your system!!!"); + throw new Error(Messages.getString("sound.1A")); } / * It's not determine what provider for this service I should to use, and so Modified: harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/org/apache/harmony/sound/internal/nls/messages.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/org/apache/harmony/sound/internal/nls/messages.properties?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/org/apache/harmony/sound/internal/nls/messages.properties (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/sound/src/main/java/org/apache/harmony/sound/internal/nls/messages.properties Fri Apr 2 05:57:58 2010 @@ -37,3 +37,10 @@ sound.15=Could not get audio input strea sound.16=Could not get audio input stream from input URL sound.17=Could not get audio input stream from input file sound.18=Type is not supported +sound.19=There are no MidiFileReaderProviders installed on your system +sound.1A=There are no MidiFileWriterProviders installed on your system +sound.1B=There are no Receivers installed on your system +sound.1C=There are no Synthesizers installed on your system +sound.1D=There are no SoundbankReaderProviders installed on your system +sound.1E=There are no Transmitters installed on your system +sound.1F=Requested device not installed: {0} Propchange: harmony/enhanced/java/branches/java6/common_resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,3 +1,3 @@ -/harmony/enhanced/java/trunk/common_resources:929253-929271 -/harmony/enhanced/trunk/common_resources:476396-920147,921783-929252 +/harmony/enhanced/java/trunk/common_resources:929253-930072 +/harmony/enhanced/trunk/common_resources:476396-929252 /incubator/harmony/enhanced/trunk/common_resources:423974-476394 Modified: harmony/enhanced/java/branches/java6/debian/control URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/debian/control?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/debian/control (original) +++ harmony/enhanced/java/branches/java6/debian/control Fri Apr 2 05:57:58 2010 @@ -22,7 +22,7 @@ Description: Apache Harmony Java Class L Package: harmony-6.0-jre Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libstdc++6, zlib1g-dev, libxext6, libxmu6, harmony-6.0-vm, harmony-6.0-classlib -Provides: java-virtual-machine, java-runtime, java1-runtime, java2-runtime +Provides: java-virtual-machine, java-runtime, java1-runtime, java2-runtime, java2-runtime-headless, java6-runtime-headless Description: Apache Harmony JRE <insert long description, indented with spaces> Propchange: harmony/enhanced/java/branches/java6/drlvm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/drlvm:929253-929271 +/harmony/enhanced/java/trunk/drlvm:929253-930072 /harmony/enhanced/trunk/drlvm:810871-929252 /harmony/enhanced/trunk/working_vm:476396-920147 /incubator/harmony/enhanced/trunk/working_vm:423974-476394 Modified: harmony/enhanced/java/branches/java6/drlvm/make/depends.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/depends.properties?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/drlvm/make/depends.properties (original) +++ harmony/enhanced/java/branches/java6/drlvm/make/depends.properties Fri Apr 2 05:57:58 2010 @@ -32,10 +32,11 @@ apr.src.tgz.md5=85bcd8005153b8fa63b1e3f9 # ZLIB, version 1.2.1 or above # http://www.zlib.net/ -zlib.dir=${base.dep.dir}/libs/${hy.platform.variant}/zlib-123 +zlib.dir@x86@=${base.dep.dir}/libs/${hy.platform.variant}/zlib-124 +zlib.dir@x86_64@=${base.dep.dir}/libs/${hy.platform.variant}/zlib-123 zlib=${zlib.dir}/zlib.zip -zlib.url@x86@=http://www.zlib.net/zlib123-dll.zip -zlib.md5@x86@=cc7fa97f9c19386bb701acc79d0abbca +zlib.url@x86@=http://www.zlib.net/zlib124-dll.zip +zlib.md5@x86@=8dc3c0e8d1c4f27df820bba86de3aa99 zlib.url@x86_64@=http://issues.apache.org/jira/secure/attachment/12351498/zlib-x86_64-dll.zip zlib.md5@x86_64@=7397278304667d4e68e9af073da45d98 Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml?rev=930170&r1=930169&r2=930170&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml (original) +++ harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml Fri Apr 2 05:57:58 2010 @@ -89,13 +89,14 @@ if="is.windows" unless="win.setup.complete"> <check-one-file dest="${zlib}" src="${zlib.url}"/> <unzip src="${zlib}" dest="${zlib.dir}"> - <patternset includes="include/ lib/ zlib1.dll"/> + <mapper type="flatten" /> </unzip> <copy file="${zlib.dir}/zlib1.dll" todir="${drlvm.bin.dir}"/> - <copy file="${zlib.dir}/lib/zdll.lib" todir="${drlvm.lib.dir}"/> + <copy file="${zlib.dir}/zdll.lib" todir="${drlvm.lib.dir}" /> <copy todir="${drlvm.include.dir}"> - <fileset dir="${zlib.dir}/include"> - <include name="*.h" /> + <fileset dir="${zlib.dir}"> + <include name="zconf.h" /> + <include name="zlib.h" /> </fileset> </copy> </target> Propchange: harmony/enhanced/java/branches/java6/jdktools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,5 +1,5 @@ -/harmony/enhanced/java/trunk/jdktools:929253-929271 +/harmony/enhanced/java/trunk/jdktools:929253-930072 /harmony/enhanced/jdktools/trunk:630107-925933 -/harmony/enhanced/trunk/jdktools:926309-929252 +/harmony/enhanced/trunk/jdktools:810871-929252 /harmony/enhanced/trunk/working_jdktools:476396-920147 /incubator/harmony/enhanced/trunk/working_jdktools:423974-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.classpath ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/.classpath:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/.classpath:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.project ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/.project:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/.project:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/.project:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:929253-930072 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:702140-925933 -/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-929252 +/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:810871-929252 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java:467609-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 2 05:57:58 2010 @@ -1,2 +1,2 @@ -/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java:929253-929271 +/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java:929253-930072 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java:467609-476394
Mime	Unnamed text/plain (inline, 7-Bit, 89860 bytes)
	View raw message