harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r920218 - in /harmony/enhanced/jdktools/branches/java6: ./ modules/jdktools/ modules/jpda/META-INF/ modules/jpda/doc/ modules/jpda/src/main/native/jdwp/windows/agent/ modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/ modules/jpd...
Date Mon, 08 Mar 2010 07:38:01 GMT
Author: hindessm
Date: Mon Mar  8 07:38:00 2010
New Revision: 920218

URL: http://svn.apache.org/viewvc?rev=920218&view=rev
Log:
Merge changes from trunk@920129 to java6 branch.

Removed:
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.properties
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.properties
Modified:
    harmony/enhanced/jdktools/branches/java6/   (props changed)
    harmony/enhanced/jdktools/branches/java6/NOTICE
    harmony/enhanced/jdktools/branches/java6/modules/jpda/META-INF/MANIFEST.MF
    harmony/enhanced/jdktools/branches/java6/modules/jpda/doc/drl.css
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/dt_shmem.def
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.classpath   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.project   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.core.prefs
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF   (contents,
props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
  (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
  (props changed)

Propchange: harmony/enhanced/jdktools/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/jdktools/trunk:630107-917031
+/harmony/enhanced/jdktools/trunk:630107-920129
 /harmony/enhanced/trunk/working_jdktools:476396-920147
 /incubator/harmony/enhanced/trunk/working_jdktools:423974-476394

Modified: harmony/enhanced/jdktools/branches/java6/NOTICE
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/NOTICE?rev=920218&r1=920217&r2=920218&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/NOTICE (original)
+++ harmony/enhanced/jdktools/branches/java6/NOTICE Mon Mar  8 07:38:00 2010
@@ -1,5 +1,5 @@
 Apache Harmony
-Copyright 2006, 2009 The Apache Software Foundation.
+Copyright 2006, 2010 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/META-INF/MANIFEST.MF?rev=920218&r1=920217&r2=920218&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/META-INF/MANIFEST.MF Mon Mar  8
07:38:00 2010
@@ -4,7 +4,7 @@
 Implementation-Title: Apache Harmony
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Vendor-Id: org.apache.harmony
-Implementation-URL: http://incubator.apache.org/harmony
+Implementation-URL: http://harmony.apache.org
 Bundle-ManifestVersion: 2
 Bundle-Name: Harmony JPDA
 Bundle-SymbolicName: org.apache.harmony.jpda

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/doc/drl.css
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/doc/drl.css?rev=920218&r1=920217&r2=920218&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/doc/drl.css (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/doc/drl.css Mon Mar  8 07:38:00
2010
@@ -1,3 +1,20 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 P {
 	margin-left: 15pt;
 	margin-top: 5pt;

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def?rev=920218&r1=920217&r2=920218&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/agent/jdwp.def
Mon Mar  8 07:38:00 2010
@@ -1,3 +1,18 @@
+;  Licensed to the Apache Software Foundation (ASF) under one or more
+;  contributor license agreements.  See the NOTICE file distributed with
+;  this work for additional information regarding copyright ownership.
+;  The ASF licenses this file to You under the Apache License, Version 2.0
+;  (the "License"); you may not use this file except in compliance with
+;  the License.  You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+;  Unless required by applicable law or agreed to in writing, software
+;  distributed under the License is distributed on an "AS IS" BASIS,
+;  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;  See the License for the specific language governing permissions and
+;  limitations under the License.
+
 LIBRARY	JDWP
 
 SECTIONS

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/dt_shmem.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/dt_shmem.def?rev=920218&r1=920217&r2=920218&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/dt_shmem.def
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/dt_shmem.def
Mon Mar  8 07:38:00 2010
@@ -1,3 +1,18 @@
+;  Licensed to the Apache Software Foundation (ASF) under one or more
+;  contributor license agreements.  See the NOTICE file distributed with
+;  this work for additional information regarding copyright ownership.
+;  The ASF licenses this file to You under the Apache License, Version 2.0
+;  (the "License"); you may not use this file except in compliance with
+;  the License.  You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+;  Unless required by applicable law or agreed to in writing, software
+;  distributed under the License is distributed on an "AS IS" BASIS,
+;  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;  See the License for the specific language governing permissions and
+;  limitations under the License.
+
 LIBRARY	dt_shmem
 
 SECTIONS

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def?rev=920218&r1=920217&r2=920218&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/dt_socket.def
Mon Mar  8 07:38:00 2010
@@ -1,3 +1,18 @@
+;  Licensed to the Apache Software Foundation (ASF) under one or more
+;  contributor license agreements.  See the NOTICE file distributed with
+;  this work for additional information regarding copyright ownership.
+;  The ASF licenses this file to You under the Apache License, Version 2.0
+;  (the "License"); you may not use this file except in compliance with
+;  the License.  You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+;  Unless required by applicable law or agreed to in writing, software
+;  distributed under the License is distributed on an "AS IS" BASIS,
+;  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;  See the License for the specific language governing permissions and
+;  limitations under the License.
+
 LIBRARY	dt_socket
 
 SECTIONS

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Modified: harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF?rev=920218&r1=920217&r2=920218&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF Mon Mar
 8 07:38:00 2010
@@ -4,7 +4,7 @@
 Implementation-Title: Apache Harmony
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Vendor-Id: org.apache.harmony
-Implementation-URL: http://incubator.apache.org/harmony
+Implementation-URL: http://harmony.apache.org
 Bundle-ManifestVersion: 2
 Bundle-Name: Harmony JRE Tools
 Bundle-SymbolicName: org.apache.harmony.jretools

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  8 07:38:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:702140-917031
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:702140-920129
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:467609-476394



Mime
View raw message