harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r702139 [2/2] - in /harmony/enhanced: jdktools/trunk/make/ jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/ jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/control/ jdktool...
Date Mon, 06 Oct 2008 12:55:32 GMT
Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/Permission.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/Permission.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/Permission.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.model;
+package org.apache.harmony.jretools.policytool.model;
 
 /**
  * Represents a principal for the grant entries.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/PolicyEntry.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/PolicyEntry.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/PolicyEntry.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.model;
+package org.apache.harmony.jretools.policytool.model;
 
 /**
  * Abstract ancestor to represent a policy entry.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/Principal.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/Principal.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/Principal.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.model;
+package org.apache.harmony.jretools.policytool.model;
 
 /**
  * Represents a principal for the grant entries.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/BaseFormDialog.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/BaseFormDialog.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/BaseFormDialog.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.Dialog;

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/DirectTextEditorPanel.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/DirectTextEditorPanel.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/DirectTextEditorPanel.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 
@@ -24,7 +24,7 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
-import org.apache.harmony.tools.policytool.Consts;
+import org.apache.harmony.jretools.policytool.Consts;
 
 /**
  * An editor panel which provides an interface for direct editing the policy text.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/EditorPanel.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/EditorPanel.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/EditorPanel.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.LayoutManager;
 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/GrantEntryEditFormDialog.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/GrantEntryEditFormDialog.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/GrantEntryEditFormDialog.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -31,11 +31,11 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.apache.harmony.tools.policytool.control.Controller;
-import org.apache.harmony.tools.policytool.model.GrantEntry;
-import org.apache.harmony.tools.policytool.model.Permission;
-import org.apache.harmony.tools.policytool.model.PolicyEntry;
-import org.apache.harmony.tools.policytool.model.Principal;
+import org.apache.harmony.jretools.policytool.control.Controller;
+import org.apache.harmony.jretools.policytool.model.GrantEntry;
+import org.apache.harmony.jretools.policytool.model.Permission;
+import org.apache.harmony.jretools.policytool.model.PolicyEntry;
+import org.apache.harmony.jretools.policytool.model.Principal;
 
 /**
  * Form dialog to view and edit the grant entries.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/GraphicalEditorPanel.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/GraphicalEditorPanel.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/GraphicalEditorPanel.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 
 import javax.swing.JOptionPane;
 
-import org.apache.harmony.tools.policytool.Consts;
-import org.apache.harmony.tools.policytool.control.Controller;
-import org.apache.harmony.tools.policytool.control.InvalidPolicyTextException;
-import org.apache.harmony.tools.policytool.control.PolicyTextParser;
-import org.apache.harmony.tools.policytool.model.GrantEntry;
-import org.apache.harmony.tools.policytool.model.KeystoreEntry;
-import org.apache.harmony.tools.policytool.model.KeystorePasswordURLEntry;
-import org.apache.harmony.tools.policytool.model.PolicyEntry;
+import org.apache.harmony.jretools.policytool.Consts;
+import org.apache.harmony.jretools.policytool.control.Controller;
+import org.apache.harmony.jretools.policytool.control.InvalidPolicyTextException;
+import org.apache.harmony.jretools.policytool.control.PolicyTextParser;
+import org.apache.harmony.jretools.policytool.model.GrantEntry;
+import org.apache.harmony.jretools.policytool.model.KeystoreEntry;
+import org.apache.harmony.jretools.policytool.model.KeystorePasswordURLEntry;
+import org.apache.harmony.jretools.policytool.model.PolicyEntry;
 
 /**
  * An editor panel which provides an interface for direct editing the policy text.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/KeystoreEntryEditFormDialog.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/KeystoreEntryEditFormDialog.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/KeystoreEntryEditFormDialog.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.Frame;
@@ -30,11 +30,11 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 
-import org.apache.harmony.tools.policytool.control.Controller;
-import org.apache.harmony.tools.policytool.model.CommentEntry;
-import org.apache.harmony.tools.policytool.model.KeystoreEntry;
-import org.apache.harmony.tools.policytool.model.KeystorePasswordURLEntry;
-import org.apache.harmony.tools.policytool.model.PolicyEntry;
+import org.apache.harmony.jretools.policytool.control.Controller;
+import org.apache.harmony.jretools.policytool.model.CommentEntry;
+import org.apache.harmony.jretools.policytool.model.KeystoreEntry;
+import org.apache.harmony.jretools.policytool.model.KeystorePasswordURLEntry;
+import org.apache.harmony.jretools.policytool.model.PolicyEntry;
 
 /**
  * Form dialog to view and edit the keystore and the keystore password url entries.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/LAEFormDialog.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/LAEFormDialog.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/LAEFormDialog.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.Dialog;
 import java.awt.Frame;

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/ListAndEditPanel.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/ListAndEditPanel.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/ListAndEditPanel.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/MainFrame.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/MainFrame.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/MainFrame.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.event.WindowAdapter;
@@ -34,8 +34,8 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 
-import org.apache.harmony.tools.policytool.Consts;
-import org.apache.harmony.tools.policytool.control.Controller;
+import org.apache.harmony.jretools.policytool.Consts;
+import org.apache.harmony.jretools.policytool.control.Controller;
 
 /**
  * This is the main frame of policytool.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/PermissionEditFormDialog.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/PermissionEditFormDialog.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/PermissionEditFormDialog.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.Dialog;
@@ -34,8 +34,8 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 
-import org.apache.harmony.tools.policytool.control.Controller;
-import org.apache.harmony.tools.policytool.model.Permission;
+import org.apache.harmony.jretools.policytool.control.Controller;
+import org.apache.harmony.jretools.policytool.model.Permission;
 
 /**
  * Form dialog to view and edit the permissions of a grant entry.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/PrincipalEditFormDialog.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/PrincipalEditFormDialog.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/PrincipalEditFormDialog.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.Dialog;
@@ -31,8 +31,8 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 
-import org.apache.harmony.tools.policytool.control.Controller;
-import org.apache.harmony.tools.policytool.model.Principal;
+import org.apache.harmony.jretools.policytool.control.Controller;
+import org.apache.harmony.jretools.policytool.model.Principal;
 
 /**
  * Form dialog to view and edit the principals of a grant entry.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/WarningLogDialog.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/WarningLogDialog.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/WarningLogDialog.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.tools.policytool.view;
+package org.apache.harmony.jretools.policytool.view;
 
 import java.awt.BorderLayout;
 import java.awt.Frame;
@@ -28,7 +28,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
-import org.apache.harmony.tools.policytool.Consts;
+import org.apache.harmony.jretools.policytool.Consts;
 
 /**
  * Dialog to view the warning and error logs.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java Mon Oct  6 05:55:28 2008
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.harmony.tools.toolutils;
+package org.apache.harmony.jretools.toolutils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -34,7 +34,7 @@
 import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
 
-import org.apache.harmony.tools.keytool.KeytoolParameters;
+import org.apache.harmony.jretools.keytool.KeytoolParameters;
 
 /**
  * Class for loading and saving keystores.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/Util.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/Util.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/Util.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.tools.toolutils;
+package org.apache.harmony.jretools.toolutils;
 
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/unpack200/Main.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/unpack200/Main.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/unpack200/Main.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java Mon Oct  6 05:55:28 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.tools.unpack200;
+package org.apache.harmony.jretools.unpack200;
 
 import org.apache.harmony.unpack200.Archive;
 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java Mon Oct  6 05:55:28 2008
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.harmony.tools.keytool.tests;
+package org.apache.harmony.jretools.tests.keytool;
 
 import java.io.File;
 import java.math.BigInteger;
@@ -35,9 +35,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.harmony.tools.keytool.KeytoolException;
-import org.apache.harmony.tools.keytool.Main;
-import org.apache.harmony.tools.toolutils.KeyStoreLoaderSaver;
+import org.apache.harmony.jretools.keytool.KeytoolException;
+import org.apache.harmony.jretools.keytool.Main;
+import org.apache.harmony.jretools.toolutils.KeyStoreLoaderSaver;
 
 /**
  * Tests "-genkey" option of Keytool.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/TestUtils.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/TestUtils.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/TestUtils.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java Mon Oct  6 05:55:28 2008
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.harmony.tools.keytool.tests;
+package org.apache.harmony.jretools.tests.keytool;
 
 /**
  * Class to hold constant Strings used in all tests for Keytool.

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java (from r702047, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/tests/KeyStoreLoaderSaverTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java?p2=harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java&p1=harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/tests/KeyStoreLoaderSaverTest.java&r1=702047&r2=702139&rev=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/tests/KeyStoreLoaderSaverTest.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java Mon Oct  6 05:55:28 2008
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package org.apache.harmony.tools.toolutils.tests;
+package org.apache.harmony.jretools.tests.toolutils;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,7 +23,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.harmony.tools.toolutils.KeyStoreLoaderSaver;
+import org.apache.harmony.jretools.toolutils.KeyStoreLoaderSaver;
 
 public class KeyStoreLoaderSaverTest extends TestCase {
 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?rev=702139&r1=702138&r2=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Mon Oct  6 05:55:28 2008
@@ -72,20 +72,20 @@
         <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javap${exe.suffix}" />
         <chmod file="${jdktools.deploy.dir}/bin/javap${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/keytool${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
-
         <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}" />
         <chmod file="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
 
         <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}" />
         <chmod file="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/keytool${exe.suffix}" />
+        <chmod file="${jretools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
+
+        <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/unpack200${exe.suffix}" />
+        <chmod file="${jretools.deploy.dir}/bin/unpack200${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/policytool${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/policytool${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/policytool${exe.suffix}" />
+        <chmod file="${jretools.deploy.dir}/bin/policytool${exe.suffix}" perm="ugo+x" />
 
     </target>
 
@@ -112,9 +112,10 @@
         <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javah${progdb.suffix}" />
         <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javadoc${progdb.suffix}" />
         <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javap${progdb.suffix}" />
-        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/keytool${progdb.suffix}" />
         <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/jarsigner${progdb.suffix}" />
-    	<copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/unpack200${progdb.suffix}" />
+    	<copy file="${hy.samsa.progdb}" tofile="${jretools.deploy.dir}/bin/unpack200${progdb.suffix}" />
+        <copy file="${hy.samsa.progdb}" tofile="${jretools.deploy.dir}/bin/keytool${progdb.suffix}" />
+        <copy file="${hy.samsa.progdb}" tofile="${jretools.deploy.dir}/bin/policytool${progdb.suffix}" />
 
     </target>
 
@@ -177,16 +178,16 @@
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/bin/keytool -help in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/keytool -help in ${hy.tests.reports}"/>
         <exec failonerror="true"
-	        executable="${test.jre.home}/../bin/keytool${exe.suffix}"
+	        executable="${test.jre.home}/bin/keytool${exe.suffix}"
 	        dir="${hy.tests.reports}">
 	    <arg line="-help" />
         </exec>
 
-        <echo message="Run jdk/bin/unpack200 in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/unpack200 in ${hy.tests.reports}"/>
         <exec failonerror="true"
-	        executable="${test.jre.home}/../bin/unpack200${exe.suffix}"
+	        executable="${test.jre.home}/bin/unpack200${exe.suffix}"
 	        dir="${hy.tests.reports}">
 	    <arg line="" />
         </exec>

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c?rev=702139&r1=702138&r2=702139&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c Mon Oct  6 05:55:28 2008
@@ -35,7 +35,8 @@
 #endif
 
 #define TOOL_JAR      "tools.jar"
-#define CLASS_PREFIX  "org.apache.harmony.tools."
+#define JRE_CLASS_PREFIX  "org.apache.harmony.jretools."
+#define JDK_CLASS_PREFIX  "org.apache.harmony.tools."
 #define CLASS_POSTFIX ".Main"
 
 #if defined(WIN32)
@@ -213,9 +214,11 @@
         myArgv[newIndex++] = "-cp";
         myArgv[newIndex++] = classpath;
 
-        buffer = (char *) malloc(strlen(CLASS_PREFIX) + strlen(toolName) + strlen(CLASS_POSTFIX) + 1);
+        buffer =
+          (char *) malloc(strlen(isJRE ? JRE_CLASS_PREFIX : JDK_CLASS_PREFIX)
+                          + strlen(toolName) + strlen(CLASS_POSTFIX) + 1);
     
-        strcpy(buffer, CLASS_PREFIX);
+        strcpy(buffer, isJRE ? JRE_CLASS_PREFIX : JDK_CLASS_PREFIX);
         strcat(buffer, toolName);
         strcat(buffer, CLASS_POSTFIX);
         

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=702139&r1=702138&r2=702139&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Mon Oct  6 05:55:28 2008
@@ -316,6 +316,9 @@
     <target name="chmod-stuff" if="is.unix">
         <chmod file="${target.dir}/hdk/jdk/bin/*" perm="ugo+x" />
         <chmod file="${target.dir}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
+        <chmod file="${target.dir}/hdk/jdk/jre/bin/keytool*" perm="ugo+x" />
+        <chmod file="${target.dir}/hdk/jdk/jre/bin/policytool*" perm="ugo+x" />
+        <chmod file="${target.dir}/hdk/jdk/jre/bin/unpack200*" perm="ugo+x" />
     </target>
 
     <target name="assemble-jdk">



Mime
View raw message