From 71e8bcdbaf0ee6cc8d37102cca6ca898123dc9c9 Mon Sep 17 00:00:00 2001
From: Kushal Munir < kmunir@ca.ibm.com>
Date: Mon, 19 Feb 2007 19:32:35 +0000
Subject: [PATCH] [173871] [api] Move archivehandlers extension point to
 org.eclipse.rse.services from org.eclipse.rse.ui. Also, move some classes
 related to archive handling to internal packages.

---
 rse/plugins/org.eclipse.rse.files.ui/plugin.xml      |  2 +-
 .../org.eclipse.rse.services/META-INF/MANIFEST.MF    | 12 ++++++------
 .../org.eclipse.rse.services/build.properties        |  4 +++-
 .../clientserver/archiveutils}/ITarConstants.java    |  2 +-
 .../clientserver/archiveutils/SystemArchiveUtil.java |  2 +-
 .../archiveutils/SystemUniversalZipEntry.java        |  2 +-
 .../clientserver/archiveutils}/TarEntry.java         |  2 +-
 .../services/clientserver/archiveutils}/TarFile.java |  2 +-
 .../clientserver/archiveutils}/TarOutputStream.java  |  2 +-
 .../clientserver/archiveutils/SystemTarHandler.java  |  9 +++++----
 .../clientserver/archiveutils/SystemZipHandler.java  |  2 ++
 .../org.eclipse.rse.services/plugin.properties       |  2 ++
 rse/plugins/org.eclipse.rse.services/plugin.xml      |  6 ++++++
 .../schema/archivehandlers.exsd                      | 12 ++++++------
 rse/plugins/org.eclipse.rse.ui/plugin.xml            |  1 -
 15 files changed, 37 insertions(+), 25 deletions(-)
 rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{services/clientserver/util/tar => internal/services/clientserver/archiveutils}/ITarConstants.java (98%)
 rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{ => internal}/services/clientserver/archiveutils/SystemArchiveUtil.java (96%)
 rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{ => internal}/services/clientserver/archiveutils/SystemUniversalZipEntry.java (98%)
 rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{services/clientserver/util/tar => internal/services/clientserver/archiveutils}/TarEntry.java (99%)
 rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{services/clientserver/util/tar => internal/services/clientserver/archiveutils}/TarFile.java (99%)
 rename rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/{services/clientserver/util/tar => internal/services/clientserver/archiveutils}/TarOutputStream.java (98%)
 create mode 100644 rse/plugins/org.eclipse.rse.services/plugin.xml
 rename rse/plugins/{org.eclipse.rse.ui => org.eclipse.rse.services}/schema/archivehandlers.exsd (84%)

diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
index c64b0b439a1..2b7a59cdc10 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
@@ -213,7 +213,7 @@ Contributors:
 <!-- Add handlers for ZIP, TAR, and JAR archive files               == -->
 <!-- ================================================================= -->	
    <extension
-         point="org.eclipse.rse.ui.archivehandlers">
+         point="org.eclipse.rse.services.archivehandlers">
       <archivehandler
             fileNameExtension="zip"
             name="SystemZipHandler"
diff --git a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
index 1b6aaced9ff..4c3365d623e 100644
--- a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
@@ -1,14 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.services
+Bundle-SymbolicName: org.eclipse.rse.services;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.services.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.services,
+Export-Package: org.eclipse.rse.internal.services;x-internal:=true,
+ org.eclipse.rse.internal.services.clientserver.archiveutils;x-internal:=true,
+ org.eclipse.rse.internal.services.shells;x-internal:=true,
+ org.eclipse.rse.services,
  org.eclipse.rse.services.clientserver,
  org.eclipse.rse.services.clientserver.archiveutils,
  org.eclipse.rse.services.clientserver.java,
@@ -16,11 +19,8 @@ Export-Package: org.eclipse.rse.services,
  org.eclipse.rse.services.clientserver.processes,
  org.eclipse.rse.services.clientserver.processes.handlers,
  org.eclipse.rse.services.clientserver.search,
- org.eclipse.rse.services.clientserver.util.tar,
  org.eclipse.rse.services.files,
  org.eclipse.rse.services.processes,
  org.eclipse.rse.services.search,
- org.eclipse.rse.services.shells,
- org.eclipse.rse.internal.services;x-internal:=true,
- org.eclipse.rse.internal.services.shells;x-internal:=true
+ org.eclipse.rse.services.shells
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.services/build.properties b/rse/plugins/org.eclipse.rse.services/build.properties
index b665c773599..3f9dfd13703 100644
--- a/rse/plugins/org.eclipse.rse.services/build.properties
+++ b/rse/plugins/org.eclipse.rse.services/build.properties
@@ -13,7 +13,9 @@ bin.includes = META-INF/,\
                clientserver.jar,\
                patterns.dat,\
                plugin.properties,\
-               .
+               .,\
+               plugin.xml,\
+               schema/
 jars.compile.order = clientserver.jar,.
 source.clientserver.jar = clientserver/
 output.clientserver.jar = clientserver.bin/
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/ITarConstants.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/ITarConstants.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/ITarConstants.java
rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/ITarConstants.java
index ff346c13dc5..8c73f7d0566 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/ITarConstants.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/ITarConstants.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.services.clientserver.util.tar;
+package org.eclipse.rse.internal.services.clientserver.archiveutils;
 
 /**
  * This interface contains all constants needed for the tar package.s
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemArchiveUtil.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/SystemArchiveUtil.java
similarity index 96%
rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemArchiveUtil.java
rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/SystemArchiveUtil.java
index ffe8f90156d..48eacd4b375 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemArchiveUtil.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/SystemArchiveUtil.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.services.clientserver.archiveutils;
+package org.eclipse.rse.internal.services.clientserver.archiveutils;
 
 import java.io.File;
 import java.util.HashSet;
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemUniversalZipEntry.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/SystemUniversalZipEntry.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemUniversalZipEntry.java
rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/SystemUniversalZipEntry.java
index a98ee2e8ec6..57bd1850f0e 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemUniversalZipEntry.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/SystemUniversalZipEntry.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.services.clientserver.archiveutils;
+package org.eclipse.rse.internal.services.clientserver.archiveutils;
 
 import java.util.zip.ZipEntry;
 
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarEntry.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarEntry.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarEntry.java
rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarEntry.java
index fdd7318ab21..6d036254497 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarEntry.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarEntry.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.services.clientserver.util.tar;
+package org.eclipse.rse.internal.services.clientserver.archiveutils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarFile.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarFile.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarFile.java
rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarFile.java
index bce17702b2e..bd7e1824bee 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarFile.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarFile.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.services.clientserver.util.tar;
+package org.eclipse.rse.internal.services.clientserver.archiveutils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarOutputStream.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarOutputStream.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarOutputStream.java
rename to rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarOutputStream.java
index 6d0f9e34384..aa1e353d9b1 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarOutputStream.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/internal/services/clientserver/archiveutils/TarOutputStream.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.services.clientserver.util.tar;
+package org.eclipse.rse.internal.services.clientserver.archiveutils;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java
index 4955427430d..7b9f911355c 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java
@@ -32,15 +32,16 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Vector;
 
+import org.eclipse.rse.internal.services.clientserver.archiveutils.ITarConstants;
+import org.eclipse.rse.internal.services.clientserver.archiveutils.SystemArchiveUtil;
+import org.eclipse.rse.internal.services.clientserver.archiveutils.TarEntry;
+import org.eclipse.rse.internal.services.clientserver.archiveutils.TarFile;
+import org.eclipse.rse.internal.services.clientserver.archiveutils.TarOutputStream;
 import org.eclipse.rse.services.clientserver.ISystemFileTypes;
 import org.eclipse.rse.services.clientserver.java.BasicClassFileParser;
 import org.eclipse.rse.services.clientserver.search.SystemSearchLineMatch;
 import org.eclipse.rse.services.clientserver.search.SystemSearchStringMatchLocator;
 import org.eclipse.rse.services.clientserver.search.SystemSearchStringMatcher;
-import org.eclipse.rse.services.clientserver.util.tar.ITarConstants;
-import org.eclipse.rse.services.clientserver.util.tar.TarEntry;
-import org.eclipse.rse.services.clientserver.util.tar.TarFile;
-import org.eclipse.rse.services.clientserver.util.tar.TarOutputStream;
 
 
 /**
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
index ea340b42241..7ce39b192b6 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
@@ -33,6 +33,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import org.eclipse.rse.internal.services.clientserver.archiveutils.SystemArchiveUtil;
+import org.eclipse.rse.internal.services.clientserver.archiveutils.SystemUniversalZipEntry;
 import org.eclipse.rse.services.clientserver.ISystemFileTypes;
 import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
 import org.eclipse.rse.services.clientserver.java.BasicClassFileParser;
diff --git a/rse/plugins/org.eclipse.rse.services/plugin.properties b/rse/plugins/org.eclipse.rse.services/plugin.properties
index 965dcef249a..8b990530eae 100644
--- a/rse/plugins/org.eclipse.rse.services/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services/plugin.properties
@@ -14,3 +14,5 @@
 
 pluginName = RSE Services Framework
 providerName = Eclipse.org
+
+extPoint.archivehandlers = Remote Archive Handlers
diff --git a/rse/plugins/org.eclipse.rse.services/plugin.xml b/rse/plugins/org.eclipse.rse.services/plugin.xml
new file mode 100644
index 00000000000..dc113d492b7
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services/plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension-point id="archivehandlers" name="%extPoint.archivehandlers" schema="schema/archivehandlers.exsd"/>
+
+</plugin>
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/archivehandlers.exsd b/rse/plugins/org.eclipse.rse.services/schema/archivehandlers.exsd
similarity index 84%
rename from rse/plugins/org.eclipse.rse.ui/schema/archivehandlers.exsd
rename to rse/plugins/org.eclipse.rse.services/schema/archivehandlers.exsd
index cd06db115f2..d7d2e48dd37 100644
--- a/rse/plugins/org.eclipse.rse.ui/schema/archivehandlers.exsd
+++ b/rse/plugins/org.eclipse.rse.services/schema/archivehandlers.exsd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.ui">
+<schema targetNamespace="org.eclipse.rse.services">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.rse.ui" id="archivehandlers" name="Archive Handlers"/>
+         <meta.schema plugin="org.eclipse.rse.services" id="archivehandlers" name="Archive Handlers"/>
       </appInfo>
       <documentation>
-         This extension point is used to plug in additional Archive Handlers. These are used to provide seamless integration between Archive Handling and the RSE.
+         This extension point is used to plug in additional archive handlers. Archive handlers are used to provide seamless integration of archives within the RSE. For example, an archive can be expanded to show its contents in RSE if an archive handler is registered for that archive type and handles showing the contents of archives.
       </documentation>
    </annotation>
 
@@ -97,7 +97,7 @@
 
 &lt;p&gt;
 &lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.rse.ui.archivehandlers&quot;&gt;
+   &lt;extension point=&quot;org.eclipse.rse.services.archivehandlers&quot;&gt;
       &lt;archivehandler
          id=&quot;org.eclipse.rse.services.clientserver.archiveutils.systemziphandler&quot;
          name=&quot;Zip File Handler&quot;
@@ -123,7 +123,7 @@
          <meta.section type="implementation"/>
       </appInfo>
       <documentation>
-         The Remote System Explorer in org.eclipse.rse.files.ui provides three default implementations of this extension point, for ZIP, JAR, and TAR Archives.
+         The Remote System Explorer, in the org.eclipse.rse.files.ui plugin, provides three default implementations of this extension point for ZIP, JAR, and TAR archives.
       </documentation>
    </annotation>
 
@@ -132,7 +132,7 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2002, 2006 IBM Corporation. All Rights Reserved.
+         Copyright (c) 2002, 2006, 2007 IBM Corporation. All Rights Reserved.
 This program and the accompanying materials are made available under the terms
 of the Eclipse Public License v1.0 which accompanies this distribution, and is 
 available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 3baaaff34d2..38bf1b39992 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -467,7 +467,6 @@ Contributors:
 <!-- ================================================================= -->
 <!-- 		Define Archive Handlers extension point					   -->
 <!-- ================================================================= -->
-   <extension-point id="archivehandlers" name="%extPoint.archivehandlers" schema="schema/archivehandlers.exsd"/>
 
 
 <!-- ================================================================= -->