diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/META-INF/MANIFEST.MF b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/META-INF/MANIFEST.MF
index 7ef2b5f7d68dd5d88d9f642a3e6e81dae3557b1f..4a51d09e74d2c2c4326b87098c9a8689d22066ca 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/META-INF/MANIFEST.MF
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/META-INF/MANIFEST.MF
@@ -9,22 +9,9 @@ Export-Package: org.eclipse.wtp.releng.tools.component,
org.eclipse.wtp.releng.tools.component.api,
org.eclipse.wtp.releng.tools.component.api.compatibility,
org.eclipse.wtp.releng.tools.component.api.progress,
- org.eclipse.wtp.releng.tools.component.api.testcoverage,
- org.eclipse.wtp.releng.tools.component.api.usecoverage,
org.eclipse.wtp.releng.tools.component.api.violation,
- org.eclipse.wtp.releng.tools.component.classes,
- org.eclipse.wtp.releng.tools.component.codecoverage,
- org.eclipse.wtp.releng.tools.component.dependency,
org.eclipse.wtp.releng.tools.component.images,
org.eclipse.wtp.releng.tools.component.internal,
- org.eclipse.wtp.releng.tools.component.java,
- org.eclipse.wtp.releng.tools.component.javadoc,
- org.eclipse.wtp.releng.tools.component.model,
- org.eclipse.wtp.releng.tools.component.piagent,
- org.eclipse.wtp.releng.tools.component.tptp,
- org.eclipse.wtp.releng.tools.component.use,
- org.eclipse.wtp.releng.tools.component.util,
- org.eclipse.wtp.releng.tools.component.violation,
org.eclipse.wtp.releng.tools.component.xsl
Require-Bundle: org.eclipse.jdt.core,
org.eclipse.core.runtime,
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/plugin.xml b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/plugin.xml
index 78fc328da74fd77c0f217fd887bb6be22d20ba22..c7e3b22e97aa084afab06e0783125131ec8796c7 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/plugin.xml
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/plugin.xml
@@ -6,7 +6,7 @@
point="org.eclipse.core.runtime.applications">
<application>
<run
- class="org.eclipse.wtp.releng.tools.component.java.Java2API">
+ class="org.eclipse.wtp.releng.tools.component.adopters.Java2API">
</run>
</application>
</extension>
@@ -15,7 +15,7 @@
point="org.eclipse.core.runtime.applications">
<application>
<run
- class="org.eclipse.wtp.releng.tools.component.java.JavadocScanner">
+ class="org.eclipse.wtp.releng.tools.component.adopters.JavadocScanner">
</run>
</application>
</extension>
@@ -24,7 +24,7 @@
point="org.eclipse.core.runtime.applications">
<application>
<run
- class="org.eclipse.wtp.releng.tools.component.classes.Class2Reference">
+ class="org.eclipse.wtp.releng.tools.component.api.violation.Class2Reference">
</run>
</application>
</extension>
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/tptp/CodeCoverageScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CodeCoverageScanner.java
similarity index 98%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/tptp/CodeCoverageScanner.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CodeCoverageScanner.java
index 6e6fd38d0e0ebbef7f71084cc67d9d12592edd2b..e496dccd1e25978897623d4222f4a392c4cc9b58 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/tptp/CodeCoverageScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CodeCoverageScanner.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.tptp;
+package org.eclipse.wtp.releng.tools.component;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -24,8 +24,7 @@ import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.eclipse.wtp.releng.tools.component.ILocation;
-import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
+
import org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ClassAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
@@ -35,7 +34,6 @@ import org.eclipse.wtp.releng.tools.component.api.TestCoverage;
import org.eclipse.wtp.releng.tools.component.images.ImagesUtil;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CommandOptionParser.java
similarity index 96%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CommandOptionParser.java
index e6f61c5075bb92e0a253872b9198f044bc8e46a1..d2d5fb4c3070a37ad6f998bba8b58c406ca42d2a 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommandOptionParser.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CommandOptionParser.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.util;
+package org.eclipse.wtp.releng.tools.component;
import java.util.Collection;
import java.util.HashMap;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/IClassVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClassVisitor.java
similarity index 84%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/IClassVisitor.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClassVisitor.java
index 106278256fc0d376781a7434c361f5165d4d3738..1ebd8195f19cf9093a34826ac91e436e66aea5f1 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/IClassVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IClassVisitor.java
@@ -9,9 +9,8 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.classes;
+package org.eclipse.wtp.releng.tools.component;
-import org.eclipse.wtp.releng.tools.component.ILocation;
public interface IClassVisitor
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/IJavaVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IJavaVisitor.java
similarity index 85%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/IJavaVisitor.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IJavaVisitor.java
index ee24a89165749a60629587a32d2ee7f1c4db140e..03e5eb1c0f03708f9319354d98f45589b79d74b0 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/IJavaVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/IJavaVisitor.java
@@ -9,9 +9,8 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.java;
+package org.eclipse.wtp.releng.tools.component;
-import org.eclipse.wtp.releng.tools.component.ILocation;
public interface IJavaVisitor
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/APIRefCompatibilityScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/APIRefCompatibilityScanner.java
index 64e2fa1f9237031c67c413cca6f7420564180872..676a1e0febee697d77dc423fdb6e6a16a2264956 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/APIRefCompatibilityScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/APIRefCompatibilityScanner.java
@@ -27,6 +27,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.eclipse.core.runtime.IPlatformRunnable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.Signature;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
import org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI;
@@ -36,7 +37,6 @@ import org.eclipse.wtp.releng.tools.component.api.FieldAPI;
import org.eclipse.wtp.releng.tools.component.api.MethodAPI;
import org.eclipse.wtp.releng.tools.component.api.PackageAPI;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
import org.xml.sax.SAXException;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineClass2Reference.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineClass2Reference.java
index da79af8468db9396fe48cc02967ca6e5821589cc..6c847a7fac11fd53da31e40d3cf4a3a8aa8066ae 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineClass2Reference.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineClass2Reference.java
@@ -28,14 +28,14 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.api.ComponentXMLVisitor;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
/**
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineExtensionPointScans.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineExtensionPointScans.java
index e30047c593173480a74105781e56bf57fb05a180..70166565d902c7cb0301b0e14e383faacaf49bd4 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineExtensionPointScans.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/CombineExtensionPointScans.java
@@ -12,7 +12,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
/**
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ExtensionPointScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ExtensionPointScanner.java
index ce3af073edd0b355eb064908ba9d3e9cbfd156fb..7c413b6e6b828f971d797f24d30135410eb55faf 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ExtensionPointScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ExtensionPointScanner.java
@@ -25,7 +25,7 @@ import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IPlatformRunnable;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
/**
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/Java2API.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Java2API.java
similarity index 95%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/Java2API.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Java2API.java
index 21f2cb0d0830aa4fecb921d0b4b64b5d5edeb879..a4887cdf2173da27663a4f9779147f9a6f7d8a9d 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/Java2API.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Java2API.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.java;
+package org.eclipse.wtp.releng.tools.component.adopters;
import java.io.CharArrayWriter;
import java.io.File;
@@ -24,13 +24,14 @@ import org.eclipse.core.runtime.IPlatformRunnable;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.IJavaVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentDepends;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentDepends;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
public class Java2API implements IJavaVisitor, IPlatformRunnable
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/Java2APIVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Java2APIVisitor.java
similarity index 89%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/Java2APIVisitor.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Java2APIVisitor.java
index d8f23e43e0f7a5ceda08de575411705805be2259..c690f159d567bdf3eb6012fd6da20baaf39ce6b6 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/Java2APIVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Java2APIVisitor.java
@@ -9,13 +9,13 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.java;
+package org.eclipse.wtp.releng.tools.component.adopters;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.PackageDeclaration;
import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
public class Java2APIVisitor extends ASTVisitor
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/JavadocScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/JavadocScanner.java
similarity index 96%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/JavadocScanner.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/JavadocScanner.java
index f3902e42758ec8fd87a6e34e913c09e24a6bc8a9..9dfce6f71590e2131a27fe5e9c3f3e6683295aa6 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/JavadocScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/JavadocScanner.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.java;
+package org.eclipse.wtp.releng.tools.component.adopters;
import java.io.ByteArrayInputStream;
import java.io.CharArrayWriter;
@@ -26,19 +26,20 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.IJavaVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
import org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentXMLVisitor;
import org.eclipse.wtp.releng.tools.component.images.ImagesUtil;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class JavadocScanner implements IJavaVisitor, IPlatformRunnable
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/JavadocVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/JavadocVisitor.java
similarity index 99%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/JavadocVisitor.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/JavadocVisitor.java
index aeacadd86eefd6e5646e740ab31054de81130ba9..ad696be1e1c84029e4d7a1c55672afcdfc42d661 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/JavadocVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/JavadocVisitor.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.java;
+package org.eclipse.wtp.releng.tools.component.adopters;
import java.lang.reflect.Method;
import java.util.ArrayList;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/PDESourceVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/PDESourceVisitor.java
similarity index 97%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/PDESourceVisitor.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/PDESourceVisitor.java
index aa22d282c5dc38bf949b75edab831c51294654a6..322ac67d47fe5f7fab2e694fb3fa18a56ffff13a 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/java/PDESourceVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/PDESourceVisitor.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.java;
+package org.eclipse.wtp.releng.tools.component.adopters;
import java.util.ArrayList;
import java.util.Collection;
@@ -18,6 +18,7 @@ import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.wtp.releng.tools.component.IFileLocation;
+import org.eclipse.wtp.releng.tools.component.IJavaVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationChildrenIterator;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Plugin2API.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Plugin2API.java
index 3b8dcd20f117b69d571aec57d4d1dcb8a6e3dafd..2496e0c247b2650757e85f54560f893bb5b5cc1f 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Plugin2API.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/Plugin2API.java
@@ -32,20 +32,19 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.jdt.core.util.ClassFormatException;
import org.eclipse.jdt.core.util.IClassFileReader;
import org.eclipse.jdt.internal.core.util.ClassFileReader;
+import org.eclipse.wtp.releng.tools.component.IClassVisitor;
import org.eclipse.wtp.releng.tools.component.IFileLocation;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationChildrenIterator;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
import org.eclipse.wtp.releng.tools.component.IZipLocation;
-import org.eclipse.wtp.releng.tools.component.classes.IClassVisitor;
import org.eclipse.wtp.releng.tools.component.internal.Bundle;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentDepends;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.java.Java2API;
-import org.eclipse.wtp.releng.tools.component.model.ComponentDepends;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/SimpleClass2Reference.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/SimpleClass2Reference.java
index 902feb6aec630962b0f316e04651851038cc730b..42e28eac7cbf77d21900b97f54c00c4afc09faa0 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/SimpleClass2Reference.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/SimpleClass2Reference.java
@@ -38,17 +38,17 @@ import org.eclipse.jdt.core.util.IFieldInfo;
import org.eclipse.jdt.core.util.ILineNumberAttribute;
import org.eclipse.jdt.core.util.IMethodInfo;
import org.eclipse.jdt.internal.core.util.ClassFileReader;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.IClassVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPICache;
-import org.eclipse.wtp.releng.tools.component.classes.IClassVisitor;
-import org.eclipse.wtp.releng.tools.component.classes.LibVisitor;
+import org.eclipse.wtp.releng.tools.component.api.violation.LibVisitor;
import org.eclipse.wtp.releng.tools.component.internal.FieldRef;
import org.eclipse.wtp.releng.tools.component.internal.InternalByteCodeVisitor;
import org.eclipse.wtp.releng.tools.component.internal.Location;
import org.eclipse.wtp.releng.tools.component.internal.MethodRef;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class SimpleClass2Reference implements IPlatformRunnable, IClassVisitor
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java
index cc668c0517a2b124aaede3e9c6dbc23380f31bcb..9e582d21f34f8815cfbb7861fe4cc232de5524ce 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java
@@ -30,18 +30,18 @@ import org.eclipse.jdt.core.util.IExceptionAttribute;
import org.eclipse.jdt.core.util.IFieldInfo;
import org.eclipse.jdt.core.util.IMethodInfo;
import org.eclipse.jdt.internal.core.util.ClassFileReader;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.IClassVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
-import org.eclipse.wtp.releng.tools.component.classes.IClassVisitor;
-import org.eclipse.wtp.releng.tools.component.classes.LibVisitor;
+import org.eclipse.wtp.releng.tools.component.api.violation.LibVisitor;
import org.eclipse.wtp.releng.tools.component.images.ImagesUtil;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class API2ComponentAPI implements IClassVisitor
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java
index 997362e9414c267d4974dd500aa6456a29e4ca34..f16b51c76f7fdc32368756b8da83a6e04c2c7942 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassAPI.java
@@ -17,7 +17,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.eclipse.wtp.releng.tools.component.model.Type;
+
+import org.eclipse.wtp.releng.tools.component.internal.Type;
public class ClassAPI extends Type
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ClassUse.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassUse.java
similarity index 93%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ClassUse.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassUse.java
index 11284a2dfd72be727d4cc95e27a0a3b83b2111b1..efd0c5cfd41abb3cdfa169b36fd9eaf4f483b5c3 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ClassUse.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ClassUse.java
@@ -9,12 +9,11 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.use;
+package org.eclipse.wtp.releng.tools.component.api;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.eclipse.wtp.releng.tools.component.api.ClassAPI;
public class ClassUse extends ClassAPI
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java
index 727adb521500d5b2379b67ab3e54deddbb1599c0..505e60e5f0ccf563b5082f5d090c96a012c3e48c 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPI.java
@@ -33,7 +33,7 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.eclipse.wtp.releng.tools.component.ILocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentObject;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPICache.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPICache.java
index 572d719f17b6dc3b897e8e5d1e90b71c01df32e5..3a49d15221c1b93bf6eb749bc4913c22bb03b0a1 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPICache.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPICache.java
@@ -18,11 +18,11 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.util.CommonUtil;
public class ComponentAPICache
{
@@ -39,7 +39,16 @@ public class ComponentAPICache
public ComponentAPICache(int size, String compAPIDir)
{
this.size = size;
- this.compAPIDir = CommonUtil.addTrailingSeperator(compAPIDir);
+ this.compAPIDir = addTrailingSeperator(compAPIDir);
+ }
+
+ private String addTrailingSeperator(String s) {
+ if (s != null && !s.endsWith("/") && !s.endsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
+ StringBuffer sb = new StringBuffer(s);
+ sb.append('/');
+ return sb.toString();
+ }
+ return s;
}
public ComponentAPI getComponentAPI(String id) throws IOException
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java
index 11788bcdd01018105b476c252da4342c527b26ea..3976908bdee1370cb82885bca7d2266881194246 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentAPIEmitter.java
@@ -20,17 +20,18 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.IClazz;
import org.eclipse.wtp.releng.tools.component.IClazzVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.jdt.core.util.IExceptionAttribute;
import org.eclipse.jdt.core.util.IFieldInfo;
import org.eclipse.jdt.core.util.IMethodInfo;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUse.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentUse.java
similarity index 98%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUse.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentUse.java
index c6043987f1dcafd4c9158eb6bb39f61cb4ee2391..3a49b27c815952f472ac1d4f615a7a7f8e12196a 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUse.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentUse.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.use;
+package org.eclipse.wtp.releng.tools.component.api;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -31,7 +31,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.eclipse.wtp.releng.tools.component.ILocation;
-import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentUseEmitter.java
similarity index 97%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentUseEmitter.java
index ed10982c2b8eaa69f3c14124415da9bb1823d269..2b42f4dc832993642d7c5989aa64880f2cd207e0 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/ComponentUseEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentUseEmitter.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.use;
+package org.eclipse.wtp.releng.tools.component.api;
import java.io.File;
import java.io.IOException;
@@ -19,19 +19,19 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.IClazz;
import org.eclipse.wtp.releng.tools.component.IClazzVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
-import org.eclipse.wtp.releng.tools.component.api.FieldAPI;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUse;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FieldRef;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.MethodRef;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUse;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
public class ComponentUseEmitter extends AbstractEmitter implements IClazzVisitor
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentXMLVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentXMLVisitor.java
index 550901b50e5b073a6345ba5ebac3808e999a5f21..c9e1f6982e3e72dd692c6c9780f073c44e42ae0c 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentXMLVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/ComponentXMLVisitor.java
@@ -17,7 +17,7 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
public class ComponentXMLVisitor implements ILocationVisitor
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java
index 89c2597a5ee49f5d4038dd2384768ce26eeb9aad..60c3832edec90b1e7171fbce63f11fcfc2c3fc63 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldAPI.java
@@ -11,7 +11,7 @@
package org.eclipse.wtp.releng.tools.component.api;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentObject;
public class FieldAPI extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/FieldUse.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldUse.java
similarity index 91%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/FieldUse.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldUse.java
index 54632752d5cf1e166844d77813a6b22b6a4ca45d..fd3e45a24e3ff7705329a9f4c0eec6a564eb90dd 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/FieldUse.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/FieldUse.java
@@ -9,12 +9,11 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.use;
+package org.eclipse.wtp.releng.tools.component.api;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.eclipse.wtp.releng.tools.component.api.FieldAPI;
public class FieldUse extends FieldAPI
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/JavadocCoverage.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/JavadocCoverage.java
index 188824be9d19e53dbfa2e3f32fedb79bafaa96c9..7a8683b2edae76bf6273e8927f01cb2ad67f98e2 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/JavadocCoverage.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/JavadocCoverage.java
@@ -14,7 +14,8 @@ package org.eclipse.wtp.releng.tools.component.api;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
+
+import org.eclipse.wtp.releng.tools.component.internal.ComponentObject;
public class JavadocCoverage extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java
index 72102942e863acac22f48555baba796adc44b9c8..c5be030910e907e12046a495d940dfc719d7a783 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodAPI.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.jdt.core.Signature;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentObject;
public class MethodAPI extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/MethodUse.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodUse.java
similarity index 91%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/MethodUse.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodUse.java
index f5154870b85cc337fe6cabceb0449ccd7f0ea80b..e8d091d7e4e10a9d126874fdb4d0ee655b5c478f 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/MethodUse.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/MethodUse.java
@@ -9,12 +9,11 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.use;
+package org.eclipse.wtp.releng.tools.component.api;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.eclipse.wtp.releng.tools.component.api.MethodAPI;
public class MethodUse extends MethodAPI
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java
index 0a147fb6dd9fbd9151b50256f51581f3507cfe0c..2f5f1d0f2e7b33c1e3a0bff8a64aa3847bd7d708 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/PackageAPI.java
@@ -15,7 +15,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
+
+import org.eclipse.wtp.releng.tools.component.internal.ComponentObject;
public class PackageAPI extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/Source.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/Source.java
similarity index 96%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/Source.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/Source.java
index c5b6b3c42d43582625e088ab5eaea74419172a6e..bdefe6b91fec0f715e083b74f2538bdb584a6ee7 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/use/Source.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/Source.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.use;
+package org.eclipse.wtp.releng.tools.component.api;
import java.util.Collection;
import java.util.HashMap;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/TestCoverage.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/TestCoverage.java
index 4b5dcad5fed19384020dc9ec8cb3f27134421eb5..16ec365013a20b4b0d8bec3cface0288eeb3206c 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/TestCoverage.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/TestCoverage.java
@@ -14,7 +14,8 @@ package org.eclipse.wtp.releng.tools.component.api;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
+
+import org.eclipse.wtp.releng.tools.component.internal.ComponentObject;
public class TestCoverage extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java
index 95ecb62b41c2fd5a6993c4089f49704ce133c285..2c7fb8418bb325fbc33bde3e8d008116a9f442cf 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityEmitter.java
@@ -28,6 +28,8 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.api.ClassAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
@@ -37,7 +39,6 @@ import org.eclipse.wtp.releng.tools.component.api.PackageAPI;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.URLLocation;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityScanner.java
index 58bb72aff4a7a085fdc08864c1c45e3bd5c9be0d..b9f0797814762958fc974ccb423d47305e31f3b8 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/compatibility/APICompatibilityScanner.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
import org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI;
@@ -30,7 +32,6 @@ import org.eclipse.wtp.releng.tools.component.api.PackageAPI;
import org.eclipse.wtp.releng.tools.component.images.ImagesUtil;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class APICompatibilityScanner
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressEmitter.java
index 16ad7de4b61ecfafd533bc56461e4bc4aae3ed7c..ea6f8f9c360a78294231a560e1689d702b5c52e8 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressEmitter.java
@@ -36,13 +36,14 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Description;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Description;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.xml.sax.SAXException;
public class APIProgressEmitter extends AbstractEmitter
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressScanner.java
index 38cf4b5fd6a30259be01c63d2d0592c39436de4a..49a0fec4050e43a6bd1b858553440a8fe1124b6e 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIProgressScanner.java
@@ -27,18 +27,18 @@ import java.util.Map;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationChildrenIterator;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentXMLVisitor;
-import org.eclipse.wtp.releng.tools.component.classes.PluginVisitor;
+import org.eclipse.wtp.releng.tools.component.api.violation.PluginVisitor;
import org.eclipse.wtp.releng.tools.component.images.ImagesUtil;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class APIProgressScanner extends AbstractEmitter
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APITestCoverageEmitter.java
similarity index 97%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageEmitter.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APITestCoverageEmitter.java
index 49d896b99fd3f876c7a2218b6ca7060fe6e6c3a8..ba89d57cd7f62d8d5f22171bf1b3fce2d7539190 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APITestCoverageEmitter.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.api.testcoverage;
+package org.eclipse.wtp.releng.tools.component.api.progress;
import java.io.BufferedInputStream;
import java.io.File;
@@ -29,29 +29,29 @@ import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import org.eclipse.jdt.core.util.IModifierConstants;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.IClazz;
import org.eclipse.wtp.releng.tools.component.IClazzVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
import org.eclipse.wtp.releng.tools.component.api.ClassAPI;
+import org.eclipse.wtp.releng.tools.component.api.ClassUse;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPIEmitter;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUse;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUseEmitter;
import org.eclipse.wtp.releng.tools.component.api.MethodAPI;
+import org.eclipse.wtp.releng.tools.component.api.MethodUse;
import org.eclipse.wtp.releng.tools.component.api.PackageAPI;
+import org.eclipse.wtp.releng.tools.component.api.Source;
import org.eclipse.wtp.releng.tools.component.api.TestCoverage;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
import org.eclipse.wtp.releng.tools.component.internal.ComponentEntry;
import org.eclipse.wtp.releng.tools.component.internal.ComponentSummary;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.use.ClassUse;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUse;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUseEmitter;
-import org.eclipse.wtp.releng.tools.component.use.MethodUse;
-import org.eclipse.wtp.releng.tools.component.use.Source;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageSummary.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APITestCoverageSummary.java
similarity index 98%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageSummary.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APITestCoverageSummary.java
index d628c98df127bc3a1ffe7b0258f0766cb47672db..4c52e2afa77e7bc30183ec60054c182ee2524fd7 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/testcoverage/APITestCoverageSummary.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APITestCoverageSummary.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.api.testcoverage;
+package org.eclipse.wtp.releng.tools.component.api.progress;
import java.io.IOException;
import java.util.Collection;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/usecoverage/APIUseCoverageEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIUseCoverageEmitter.java
similarity index 93%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/usecoverage/APIUseCoverageEmitter.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIUseCoverageEmitter.java
index 55df08b859efe02d5b1cfb7106a78ba55ea64347..3d43150c57d24375c0fc5d64fc4ce51d4b8baed4 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/usecoverage/APIUseCoverageEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/APIUseCoverageEmitter.java
@@ -9,13 +9,13 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.api.usecoverage;
+package org.eclipse.wtp.releng.tools.component.api.progress;
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import org.eclipse.wtp.releng.tools.component.api.testcoverage.APITestCoverageEmitter;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
public class APIUseCoverageEmitter extends APITestCoverageEmitter
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/javadoc/JavadocCoverageSummary.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/JavadocCoverageSummary.java
similarity index 99%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/javadoc/JavadocCoverageSummary.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/JavadocCoverageSummary.java
index b6c187484b12e6f4ff056892bc58564080a4c82d..642a66a40f9f41cca0b175c8a2d061f940175cdf 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/javadoc/JavadocCoverageSummary.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/progress/JavadocCoverageSummary.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.javadoc;
+package org.eclipse.wtp.releng.tools.component.api.progress;
import java.io.ByteArrayInputStream;
import java.io.File;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/APIViolationScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/APIViolationScanner.java
similarity index 94%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/APIViolationScanner.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/APIViolationScanner.java
index 3c4adbe858d35c6f2e4df8d1887a6845b0d746d6..ef71ef87c64f8819af822497b0abc4d123c5b822 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/APIViolationScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/APIViolationScanner.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.violation;
+package org.eclipse.wtp.releng.tools.component.api.violation;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -23,24 +23,22 @@ import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.util.ClassFormatException;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.IClassVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
+import org.eclipse.wtp.releng.tools.component.api.ClassUse;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUse;
import org.eclipse.wtp.releng.tools.component.api.ComponentXMLVisitor;
-import org.eclipse.wtp.releng.tools.component.classes.Class2Reference;
-import org.eclipse.wtp.releng.tools.component.classes.IClassVisitor;
-import org.eclipse.wtp.releng.tools.component.classes.LibVisitor;
+import org.eclipse.wtp.releng.tools.component.api.Source;
import org.eclipse.wtp.releng.tools.component.images.ImagesUtil;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentDepends;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentDepends;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.use.ClassUse;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUse;
-import org.eclipse.wtp.releng.tools.component.use.Source;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class APIViolationScanner implements IClassVisitor
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/Class2Reference.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/Class2Reference.java
similarity index 97%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/Class2Reference.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/Class2Reference.java
index 304cc05a338a8dec0fb4e526314f4e012f26fa73..f754800166f1d588640d23083a56ca18df069d07 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/Class2Reference.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/Class2Reference.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.classes;
+package org.eclipse.wtp.releng.tools.component.api.violation;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -39,19 +39,20 @@ import org.eclipse.jdt.core.util.IFieldInfo;
import org.eclipse.jdt.core.util.ILineNumberAttribute;
import org.eclipse.jdt.core.util.IMethodInfo;
import org.eclipse.jdt.internal.core.util.ClassFileReader;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.IClassVisitor;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
+import org.eclipse.wtp.releng.tools.component.api.ClassUse;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUse;
+import org.eclipse.wtp.releng.tools.component.api.FieldUse;
+import org.eclipse.wtp.releng.tools.component.api.MethodUse;
+import org.eclipse.wtp.releng.tools.component.api.Source;
import org.eclipse.wtp.releng.tools.component.internal.FieldRef;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
import org.eclipse.wtp.releng.tools.component.internal.InternalByteCodeVisitor;
import org.eclipse.wtp.releng.tools.component.internal.Location;
import org.eclipse.wtp.releng.tools.component.internal.MethodRef;
-import org.eclipse.wtp.releng.tools.component.use.ClassUse;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUse;
-import org.eclipse.wtp.releng.tools.component.use.FieldUse;
-import org.eclipse.wtp.releng.tools.component.use.MethodUse;
-import org.eclipse.wtp.releng.tools.component.use.Source;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class Class2Reference implements IPlatformRunnable, IClassVisitor
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentAPIViolationEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentAPIViolationEmitter.java
index bc3b957153f4dc5b110613de8e54339f3fce8cdb..0a12e6b70679b7cef31f9692774935e6df8269b7 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentAPIViolationEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentAPIViolationEmitter.java
@@ -32,6 +32,7 @@ import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.eclipse.jdt.core.Signature;
import org.eclipse.jdt.core.util.IModifierConstants;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.api.ClassAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPIEmitter;
@@ -41,11 +42,10 @@ import org.eclipse.wtp.releng.tools.component.api.PackageAPI;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
import org.eclipse.wtp.releng.tools.component.internal.ComponentEntry;
import org.eclipse.wtp.releng.tools.component.internal.ComponentSummary;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.xml.sax.SAXException;
public class ComponentAPIViolationEmitter extends AbstractEmitter
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentViolationEmitter.java
similarity index 96%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationEmitter.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentViolationEmitter.java
index d19bec297e2eacd71fce9cc2846536eec941f3ce..413b5e7cbdb3d3b597cce36f599e20c829a9fe64 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentViolationEmitter.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.violation;
+package org.eclipse.wtp.releng.tools.component.api.violation;
import java.io.File;
import java.io.IOException;
@@ -21,23 +21,24 @@ import java.util.List;
import java.util.Map;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.IClazz;
import org.eclipse.wtp.releng.tools.component.ILibrary;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
+import org.eclipse.wtp.releng.tools.component.api.ClassUse;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUse;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUseEmitter;
+import org.eclipse.wtp.releng.tools.component.api.Source;
import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentDepends;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentRef;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentDepends;
-import org.eclipse.wtp.releng.tools.component.model.ComponentRef;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.use.ClassUse;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUse;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUseEmitter;
-import org.eclipse.wtp.releng.tools.component.use.Source;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
public class ComponentViolationEmitter extends AbstractEmitter
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationSummary.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentViolationSummary.java
similarity index 93%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationSummary.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentViolationSummary.java
index bd0efcbef91f3fd4d2cddae6750faf15e23756ad..13260b9d6e2ff2f924e699f4e17f38b7d1c5085b 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/violation/ComponentViolationSummary.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/ComponentViolationSummary.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.violation;
+package org.eclipse.wtp.releng.tools.component.api.violation;
import java.io.IOException;
import java.util.Iterator;
@@ -17,10 +17,10 @@ import java.util.List;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import org.eclipse.wtp.releng.tools.component.ILocation;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUse;
+import org.eclipse.wtp.releng.tools.component.api.Source;
import org.eclipse.wtp.releng.tools.component.internal.ComponentEntry;
import org.eclipse.wtp.releng.tools.component.internal.ComponentSummary;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUse;
-import org.eclipse.wtp.releng.tools.component.use.Source;
public class ComponentViolationSummary extends ComponentSummary
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/LibVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/LibVisitor.java
similarity index 99%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/LibVisitor.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/LibVisitor.java
index 32711dddbab10e8ed1d9d92a943f73203e8694e2..a295edf2a050c66ecd81e43279fff93dabfc0d15 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/LibVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/LibVisitor.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.classes;
+package org.eclipse.wtp.releng.tools.component.api.violation;
import java.io.IOException;
import java.util.HashMap;
@@ -19,6 +19,8 @@ import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.eclipse.wtp.releng.tools.component.IClassVisitor;
import org.eclipse.wtp.releng.tools.component.IFileLocation;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationChildrenIterator;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java
index f48617c1ab9a612d1b2e2b07c2b2d8174a3a9629..1e958b5e668abddb9c8bc93b4c3a5f107605faeb 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.Signature;
import org.eclipse.jdt.core.util.IModifierConstants;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
import org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI;
@@ -36,12 +37,11 @@ import org.eclipse.wtp.releng.tools.component.api.PackageAPI;
import org.eclipse.wtp.releng.tools.component.images.ImagesUtil;
import org.eclipse.wtp.releng.tools.component.internal.ComponentEntry;
import org.eclipse.wtp.releng.tools.component.internal.ComponentSummary;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.wtp.releng.tools.component.xsl.XSLUtil;
public class NonAPIDependencyScanner implements ILocationVisitor
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/PluginVisitor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/PluginVisitor.java
similarity index 99%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/PluginVisitor.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/PluginVisitor.java
index 211c353835ae7d8b12a2bf52e3f00e6992ba8dce..f175f7476505065519b91adb6e7a8238390ce3a3 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/classes/PluginVisitor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/PluginVisitor.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.classes;
+package org.eclipse.wtp.releng.tools.component.api.violation;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/Violation.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/Violation.java
index 0c26cf8bea551b67919656b4fd6e34c4f49094c3..5c95aa76a642ddc36a7c92a667d9c4c6bb52c0ae 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/Violation.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/Violation.java
@@ -11,7 +11,7 @@
package org.eclipse.wtp.releng.tools.component.api.violation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentObject;
public abstract class Violation extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/codecoverage/CodeCoverageScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/codecoverage/CodeCoverageScanner.java
deleted file mode 100644
index 3be7f7ceb9474088204b8d2b995d6d228caa6ea1..0000000000000000000000000000000000000000
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/codecoverage/CodeCoverageScanner.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wtp.releng.tools.component.codecoverage;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import org.eclipse.jdt.core.util.ClassFormatException;
-import org.eclipse.wtp.releng.tools.component.ILocation;
-import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
-import org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI;
-import org.eclipse.wtp.releng.tools.component.api.ClassAPI;
-import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
-import org.eclipse.wtp.releng.tools.component.api.ComponentXMLVisitor;
-import org.eclipse.wtp.releng.tools.component.api.MethodAPI;
-import org.eclipse.wtp.releng.tools.component.api.PackageAPI;
-import org.eclipse.wtp.releng.tools.component.api.TestCoverage;
-import org.eclipse.wtp.releng.tools.component.classes.Class2Reference;
-import org.eclipse.wtp.releng.tools.component.classes.IClassVisitor;
-import org.eclipse.wtp.releng.tools.component.classes.LibVisitor;
-import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.use.ClassUse;
-import org.eclipse.wtp.releng.tools.component.use.MethodUse;
-import org.eclipse.wtp.releng.tools.component.use.Source;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
-
-public class CodeCoverageScanner implements IClassVisitor
-{
- private String api;
- private String src;
- private String use;
- private String outputDir;
- private Collection includes;
- private Collection excludes;
- private boolean html;
- private String xsl;
-
- public String getOutputDir()
- {
- return outputDir;
- }
-
- public void setOutputDir(String outputDir)
- {
- this.outputDir = addTrailingSeperator(outputDir);
- }
-
- public String getApi()
- {
- return api;
- }
-
- public void setApi(String api)
- {
- this.api = api;
- }
-
- public String getSrc()
- {
- return src;
- }
-
- public void setSrc(String src)
- {
- this.src = src;
- }
-
- public String getUse()
- {
- return use;
- }
-
- public void setUse(String use)
- {
- this.use = use;
- }
-
- public Collection getIncludes()
- {
- return includes;
- }
-
- public void setIncludes(Collection includes)
- {
- this.includes = includes;
- }
-
- public Collection getExcludes()
- {
- return excludes;
- }
-
- public void setExcludes(Collection excludes)
- {
- this.excludes = excludes;
- }
-
- public boolean isHtml()
- {
- return html;
- }
-
- public void setHtml(boolean html)
- {
- this.html = html;
- }
-
- public String getXsl()
- {
- return xsl;
- }
-
- public void setXsl(String xsl)
- {
- this.xsl = xsl;
- }
-
- public int getCache()
- {
- return cacheSize;
- }
-
- public void setCache(int cache)
- {
- this.cacheSize = cache;
- }
-
- private List compXMLs;
-
- public void execute()
- {
- // Collection component.xml files
- ILocation apiLocation = Location.createLocation(new File(api));
- ComponentXMLVisitor compXMLVisitor = new ComponentXMLVisitor();
- apiLocation.accept(compXMLVisitor);
- compXMLs = new ArrayList(compXMLVisitor.getCompXMLs());
-
- // Generate api-info.xml
- API2ComponentAPI api2CompXML = new API2ComponentAPI();
- api2CompXML.setApi(api);
- api2CompXML.setSrc(src);
- api2CompXML.setOutputDir(outputDir);
- api2CompXML.setIncludes(includes);
- api2CompXML.setExcludes(excludes);
- api2CompXML.execute();
-
- // Visit all .class files that uses APIs
- ILocation srcLocation = Location.createLocation(new File(use));
- LibVisitor libVisitor = new LibVisitor();
- srcLocation.accept(libVisitor);
- libVisitor.setClassVisitor(this);
- srcLocation.accept(libVisitor);
- try
- {
- for (Iterator it = cachedCompAPIs.iterator(); it.hasNext();)
- ((ComponentAPI)it.next()).save();
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- if (isHtml())
- {
- genHTML();
- }
- }
-
- private void genHTML()
- {
- ILocation outputLoc = Location.createLocation(new File(outputDir));
- outputLoc.accept(new ILocationVisitor()
- {
- public boolean accept(ILocation location)
- {
- if (location.getName().endsWith("api-info.xml"))
- {
- try
- {
- TransformerFactory factory = TransformerFactory.newInstance();
- Transformer transformer = factory.newTransformer(new StreamSource(xsl != null && xsl.length() > 0 ? Location.createLocation(new File(xsl)).getInputStream() : ClassLoader.getSystemResourceAsStream("org/eclipse/wtp/releng/tools/component/xsl/component-violation.xsl")));
- transformer.transform(new StreamSource(location.getInputStream()), new StreamResult(new FileOutputStream(((FileLocation)location.createSibling("component-violation.html")).getFile())));
- }
- catch (Throwable e)
- {
- e.printStackTrace();
- }
- }
- return true;
- }
- });
- }
-
- private Class2Reference class2Ref = new Class2Reference();
-
- public boolean visit(String pluginId, ILocation classLoc)
- {
- System.out.println(classLoc.getName());
- try
- {
- Source use = class2Ref.visit(classLoc);
- for (Iterator it = use.getClassUses().iterator(); it.hasNext();)
- {
- ClassUse classUse = (ClassUse)it.next();
- String className = classUse.getName();
- int i = className.lastIndexOf('.');
- String packageName = (i != -1) ? className.substring(0, i) : "";
- String localName = (i != -1) ? className.substring(i + 1) : className;
- String id = getComponentId(packageName);
- if (id != null)
- {
- ComponentAPI compAPI = getComponentAPI(id);
- PackageAPI pkgAPI = compAPI.getPackageAPI(packageName);
- if (pkgAPI != null)
- {
- ClassAPI classAPI = pkgAPI.getClassAPI(localName);
- if (classAPI != null)
- {
- for (Iterator it2 = classUse.getMethodUses().iterator(); it2.hasNext();)
- {
- MethodUse methodUse = (MethodUse)it2.next();
- MethodAPI methodAPI = classAPI.getMethodAPI(methodUse.getName(), methodUse.getDescriptor());
- if (methodAPI != null)
- {
- TestCoverage tc = new TestCoverage();
- tc.addTest(use.getName());
- methodAPI.setTestCoverage(tc);
- }
- }
- /*
- for (Iterator it2 = classUse.getFieldUses().iterator(); it2.hasNext();)
- {
- FieldAPI fieldAPI = classAPI.getFieldAPI(((FieldUse)it2.next()).getName());
- if (fieldAPI != null)
- {
- // set code coverage for this field
- }
- }
- */
- }
- }
- }
- }
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- catch (ClassFormatException e)
- {
- throw new RuntimeException(e);
- }
- return true;
- }
-
- private String cachedPackageName;
- private String cachedCompId;
-
- private String getComponentId(String packageName)
- {
- if (cachedPackageName != null && cachedPackageName.equals(packageName))
- {
- return cachedCompId;
- }
- for (Iterator it = compXMLs.iterator(); it.hasNext();)
- {
- ComponentXML compXML = (ComponentXML)it.next();
- if (compXML.getPackage(packageName) != null)
- {
- cachedPackageName = packageName;
- cachedCompId = compXML.getName();
- return cachedCompId;
- }
- }
- return null;
- }
-
- private int cacheSize = 20;
- private List cachedIds = new ArrayList(cacheSize);
- private List cachedCompAPIs = new ArrayList(cacheSize);
-
- private ComponentAPI getComponentAPI(String id) throws IOException
- {
- int index = cachedIds.indexOf(id);
- if (index != -1)
- {
- ComponentAPI compAPI = (ComponentAPI)cachedCompAPIs.get(index);
- if (index != 0)
- {
- cachedIds.remove(index);
- cachedCompAPIs.remove(index);
- cachedIds.add(0, id);
- cachedCompAPIs.add(0, compAPI);
- }
- return compAPI;
- }
- StringBuffer sb = new StringBuffer(outputDir);
- sb.append(id);
- sb.append("/api-info.xml");
- File file = new File(sb.toString());
- ComponentAPI compAPI = new ComponentAPI();
- compAPI.setName(id);
- compAPI.setLocation(new FileLocation(file));
- if (file.exists())
- {
- compAPI.load();
- }
- if (cachedCompAPIs.size() == cacheSize)
- {
- cachedIds.remove(cacheSize - 1);
- ((ComponentAPI)cachedCompAPIs.remove(cacheSize - 1)).save();
- }
- cachedIds.add(0, id);
- cachedCompAPIs.add(0, compAPI);
- return compAPI;
- }
-
- protected String addTrailingSeperator(String s)
- {
- if (s != null && !s.endsWith("/") && !s.endsWith("\\"))
- {
- StringBuffer sb = new StringBuffer(s);
- sb.append('/');
- return sb.toString();
- }
- else
- {
- return s;
- }
- }
-
- public static void main(String[] args)
- {
- CommandOptionParser optionParser = new CommandOptionParser(args);
- Map options = optionParser.getOptions();
- Collection api = (Collection)options.get("api");
- Collection src = (Collection)options.get("src");
- Collection use = (Collection)options.get("use");
- Collection outputDir = (Collection)options.get("outputDir");
- Collection includes = (Collection)options.get("includes");
- Collection excludes = (Collection)options.get("excludes");
- Collection html = (Collection)options.get("html");
- Collection xsl = (Collection)options.get("xsl");
- Collection cache = (Collection)options.get("cache");
- if (src == null || api == null || outputDir == null || src.isEmpty() || api.isEmpty() || outputDir.isEmpty())
- {
- printUsage();
- System.exit(-1);
- }
- CodeCoverageScanner scanner = new CodeCoverageScanner();
- scanner.setApi((String)api.iterator().next());
- scanner.setSrc((String)src.iterator().next());
- scanner.setUse((String)use.iterator().next());
- scanner.setOutputDir((String)outputDir.iterator().next());
- scanner.setIncludes(includes);
- scanner.setExcludes(excludes);
- scanner.setHtml(html != null);
- scanner.setXsl(xsl != null && !xsl.isEmpty() ? (String)xsl.iterator().next() : null);
- if (cache != null && !cache.isEmpty())
- {
- try
- {
- scanner.setCache(Integer.parseInt((String)cache.iterator().next()));
- }
- catch (NumberFormatException e)
- {
- }
- }
- scanner.execute();
- }
-
- private static void printUsage()
- {
- System.out.println("Usage: java org.eclipse.wtp.releng.tools.component.codecoverage.CodeCoverage -api <api> -src <src> -use <use> -outputDir <outputDir> [-options]");
- System.out.println("");
- System.out.println("\t-api\t\t<api>\t\tlocation of your component.xml");
- System.out.println("\t-src\t\t<src>\t\tlocation of a Eclipse-based product (requires SDK build)");
- System.out.println("\t-use\t\t<use>\t\tlocation of the code that uses the APIs");
- System.out.println("\t-outputDir\t<outputDir>\toutput directory of component.xml files");
- System.out.println("");
- System.out.println("where options include:");
- System.out.println("");
- System.out.println("\t-includes\t<includes>\tspace seperated packages to include");
- System.out.println("\t-excludes\t<excludes>\tspace seperated packages to exclude");
- System.out.println("\t-html\t\t\t\tgenerate HTML results");
- System.out.println("\t-xsl\t<xsl>\t\tuse your own stylesheet. You must specify the -html option");
- System.out.println("\t-cache\t<cache>\t\tthis option controls the size of the api-info.xml cache (default size is 20)");
- System.out.println("\t\t\t\ta larger cache usually makes the scanner to run faster, but at the expense of using more memory");
- }
-}
\ No newline at end of file
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/dependency/Plugin.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/dependency/Plugin.java
deleted file mode 100644
index 466b45a896090a05a9cd97e498b330eae9075618..0000000000000000000000000000000000000000
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/dependency/Plugin.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wtp.releng.tools.component.dependency;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Plugin
-{
- String id;
- List requires;
- List dependents;
-
- public String getId()
- {
- return id;
- }
- public void setId(String id)
- {
- this.id = id;
- }
-
- public void addRequire(Plugin plugin)
- {
- if (requires == null)
- requires = new ArrayList();
- requires.add(plugin);
- }
-
- public List getRequires()
- {
- if (requires != null)
- return new ArrayList(requires);
- else
- return new ArrayList(0);
- }
-
- public void addDependent(Plugin plugin)
- {
- if (dependents == null)
- dependents = new ArrayList();
- dependents.add(plugin);
- }
-
- public List getDependents()
- {
- if (dependents != null)
- return new ArrayList(dependents);
- else
- return new ArrayList(0);
- }
-}
\ No newline at end of file
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/dependency/PluginDependencyScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/dependency/PluginDependencyScanner.java
deleted file mode 100644
index 86e8411c0b3017569d2bf020a7c9a88eb5bc7ec5..0000000000000000000000000000000000000000
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/dependency/PluginDependencyScanner.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wtp.releng.tools.component.dependency;
-
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-import org.eclipse.core.runtime.IBundleGroup;
-import org.eclipse.core.runtime.IBundleGroupProvider;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-
-public class PluginDependencyScanner
-{
- public Map execute()
- {
- Map plugins = new HashMap();
- IBundleGroupProvider[] providers = Platform.getBundleGroupProviders();
- for (int i = 0; i < providers.length; i++)
- {
- IBundleGroup[] groups = providers[i].getBundleGroups();
- for (int j = 0; j < groups.length; j++)
- {
- Bundle[] bundles = groups[j].getBundles();
- for (int k = 0; k < bundles.length; k++)
- {
- String id = bundles[k].getSymbolicName();
- Plugin plugin = getPlugin(plugins, id);
- Dictionary headers = bundles[k].getHeaders();
- String requiredBundles = (String)headers.get(Constants.REQUIRE_BUNDLE);
- if (requiredBundles != null)
- {
- StringTokenizer st = new StringTokenizer(requiredBundles, ",");
- while (st.hasMoreTokens())
- {
- String token = st.nextToken();
- int semicolon = token.indexOf(';');
- if (semicolon != -1)
- token = token.substring(0, semicolon);
- Plugin require = getPlugin(plugins, token);
- plugin.addRequire(require);
- require.addDependent(plugin);
- }
- }
- }
- }
- }
- return plugins;
- }
-
- private Plugin getPlugin(Map plugins, String id)
- {
- if (plugins.containsKey(id))
- return (Plugin)plugins.get(id);
- else
- {
- Plugin plugin = new Plugin();
- plugin.setId(id);
- plugins.put(id, plugin);
- return plugin;
- }
- }
-}
\ No newline at end of file
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java
index e87d1863658e45240f5bba902e911098f6e58b89..692ed136f24802c72cd195b8a15a8f3d57f468fc 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/AbstractEmitter.java
@@ -29,7 +29,6 @@ import javax.xml.parsers.SAXParserFactory;
import org.eclipse.wtp.releng.tools.component.IFileLocation;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationChildrenIterator;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentDepends.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentDepends.java
similarity index 97%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentDepends.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentDepends.java
index 434b4a054fea559793c9fdf591bf9204d4091160..6bf58275a6da8a5fddaaa20693eea1c4535e5665 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentDepends.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentDepends.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
import java.util.Collection;
import java.util.HashMap;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEmitter.java
similarity index 95%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentEmitter.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEmitter.java
index e41519c334577acdab7f6f553fd31c48ff401573..b66e811db29afc649d6a5363233a21cc2e30e04b 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEmitter.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
import java.io.File;
import java.io.FileInputStream;
@@ -21,14 +21,12 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILibrary;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
-import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
-import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.internal.FragmentXML;
-import org.eclipse.wtp.releng.tools.component.use.ComponentUseEmitter;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
+import org.eclipse.wtp.releng.tools.component.api.ComponentUseEmitter;
public class ComponentEmitter extends AbstractEmitter
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java
index dded60445a9f03fe3623dc216fbb598733899bd8..9e85b3958e0969da19ad207171a8af919e7543b8 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentEntry.java
@@ -11,7 +11,6 @@
package org.eclipse.wtp.releng.tools.component.internal;
-import org.eclipse.wtp.releng.tools.component.model.ComponentObject;
public class ComponentEntry extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentObject.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentObject.java
similarity index 96%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentObject.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentObject.java
index 9837f5a9967456c060ec2168cee196378917aefa..bb6eb35892d3926c0bd868df0b74aa3aee132dfe 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentObject.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentObject.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
import java.util.Collection;
import java.util.Iterator;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentRef.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentRef.java
similarity index 94%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentRef.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentRef.java
index d58e0963b23932898b8a4d3720c7ff01f3d02584..cfe969fc28b3f5137288791aef2794b4cf31662d 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentRef.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentRef.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
public class ComponentRef
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentXML.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentXML.java
similarity index 99%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentXML.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentXML.java
index 0735bf5d29c3213fe0486521c1873940dfe36018..65b39aaf2abde372f99fc72b113b55c209d6ea40 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/ComponentXML.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/ComponentXML.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Description.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Description.java
similarity index 94%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Description.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Description.java
index 38c76e2c0424e5ae83658cedac2e6fac4b44f4fe..7c51193df69724fad023dc0dcdb1bd02add51c5f 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Description.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Description.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
public class Description extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/piagent/PIAgentFiltersEmitter.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PIAgentFiltersEmitter.java
similarity index 93%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/piagent/PIAgentFiltersEmitter.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PIAgentFiltersEmitter.java
index 916169a5c1f9ff4e24ff0816288ace7205366d4d..4cdb771612d60d77ec6e029266f1c4d4f0713264 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/piagent/PIAgentFiltersEmitter.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/PIAgentFiltersEmitter.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.piagent;
+package org.eclipse.wtp.releng.tools.component.internal;
import java.io.BufferedWriter;
import java.io.File;
@@ -20,15 +20,11 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.IClazz;
import org.eclipse.wtp.releng.tools.component.IClazzVisitor;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
-import org.eclipse.wtp.releng.tools.component.internal.AbstractEmitter;
-import org.eclipse.wtp.releng.tools.component.internal.FileLocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
public class PIAgentFiltersEmitter extends AbstractEmitter
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Package.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Package.java
similarity index 97%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Package.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Package.java
index 55d91d5ad15fdb3f140decb9b845e5d433703311..75899b181ae34f679bc3e58718e04d762f8bbf86 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Package.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Package.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
import java.util.Collection;
import java.util.HashMap;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Plugin.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Plugin.java
similarity index 95%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Plugin.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Plugin.java
index f6924dcb8d0edb3f700387db2c624b92fcfb090a..09bbe22230b46a781c2d471b528cc4bf38849f6a 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Plugin.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Plugin.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
public class Plugin
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Type.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Type.java
similarity index 97%
rename from archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Type.java
rename to archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Type.java
index a3447079936a5d52e1f69e337254bf5024468fb4..c778b17cf2f15dde63e0a73d7dbf058cc7960778 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/model/Type.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/internal/Type.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wtp.releng.tools.component.model;
+package org.eclipse.wtp.releng.tools.component.internal;
public class Type extends ComponentObject
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommonUtil.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommonUtil.java
deleted file mode 100644
index 7e4d50ceffc090bc2755d8f793731727edf94b0d..0000000000000000000000000000000000000000
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/util/CommonUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wtp.releng.tools.component.util;
-
-
-public class CommonUtil
-{
- private CommonUtil()
- {
- }
-
- public static String addTrailingSeperator(String s)
- {
- if (s != null && !s.endsWith("/") && !s.endsWith("\\"))
- {
- StringBuffer sb = new StringBuffer(s);
- sb.append('/');
- return sb.toString();
- }
- else
- {
- return s;
- }
- }
-}
\ No newline at end of file
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java
index 95e3819c914a0555fc9836c53194974aef1d1e6e..9736cf655c4591c3ea2b0d78e09028ecc7bf4a87 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/ComponentManager.java
@@ -32,8 +32,9 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.api.violation.ComponentViolationEmitter;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.BundleAdapter;
import org.eclipse.wtp.releng.tools.component.ui.internal.ScannableComponent;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
@@ -41,7 +42,6 @@ import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspacePluginXML;
import org.eclipse.wtp.releng.tools.component.ui.internal.job.AddComponent;
import org.eclipse.wtp.releng.tools.component.ui.internal.job.InitComponentManager;
import org.eclipse.wtp.releng.tools.component.ui.internal.job.RemoveComponent;
-import org.eclipse.wtp.releng.tools.component.violation.ComponentViolationEmitter;
import org.osgi.framework.Bundle;
public class ComponentManager implements IResourceChangeListener, IResourceDeltaVisitor
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java
index 11b533980cde55ee59b8bfa7f58ea5dac1f31009..4ae13a251861bab311c7a43eeb60c9122e260f81 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/ScannableComponent.java
@@ -29,14 +29,14 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.wtp.releng.tools.component.IClazz;
import org.eclipse.wtp.releng.tools.component.ILocation;
+import org.eclipse.wtp.releng.tools.component.api.Source;
+import org.eclipse.wtp.releng.tools.component.api.violation.ComponentViolationEmitter;
import org.eclipse.wtp.releng.tools.component.internal.Clazz;
-import org.eclipse.wtp.releng.tools.component.model.ComponentDepends;
-import org.eclipse.wtp.releng.tools.component.model.ComponentRef;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentDepends;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentRef;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
import org.eclipse.wtp.releng.tools.component.ui.internal.job.ScanComponent;
-import org.eclipse.wtp.releng.tools.component.use.Source;
-import org.eclipse.wtp.releng.tools.component.violation.ComponentViolationEmitter;
public class ScannableComponent implements IResourceProxyVisitor
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/JavadocScanner2.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/JavadocScanner2.java
index 7dfdf3c312bd028dc666ed408df48d9551885318..be4797a5440ea6458af5a446a54fcae3db685075 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/JavadocScanner2.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/JavadocScanner2.java
@@ -30,13 +30,13 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.wtp.releng.tools.component.CommandOptionParser;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.ILocationVisitor;
+import org.eclipse.wtp.releng.tools.component.adopters.JavadocScanner;
+import org.eclipse.wtp.releng.tools.component.adopters.JavadocVisitor;
import org.eclipse.wtp.releng.tools.component.api.ComponentAPI;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.java.JavadocScanner;
-import org.eclipse.wtp.releng.tools.component.java.JavadocVisitor;
-import org.eclipse.wtp.releng.tools.component.util.CommandOptionParser;
public class JavadocScanner2 extends JavadocScanner
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4APIViolation.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4APIViolation.java
index 8bfe927a1aef37b777fbe328969a2a8d7bcaf66c..ba9f2ff22a9116ff4b305c4ce35e0f7fda94cbb4 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4APIViolation.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4APIViolation.java
@@ -37,14 +37,14 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wtp.releng.tools.component.ILocation;
+import org.eclipse.wtp.releng.tools.component.adopters.Java2API;
import org.eclipse.wtp.releng.tools.component.api.ComponentXMLVisitor;
+import org.eclipse.wtp.releng.tools.component.api.violation.APIViolationScanner;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.java.Java2API;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.ComponentUIPlugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
-import org.eclipse.wtp.releng.tools.component.violation.APIViolationScanner;
import org.osgi.service.prefs.Preferences;
public class Scan4APIViolation extends Action implements IActionDelegate
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4MissingJavadoc.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4MissingJavadoc.java
index 9636f2c01c8048b6cc31c927aa760f2d91cbe009..97bd443e1a631638cbb9e1b4c79333a9d80e30f7 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4MissingJavadoc.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4MissingJavadoc.java
@@ -35,8 +35,8 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wtp.releng.tools.component.ILocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.ComponentUIPlugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4NonAPIDependency.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4NonAPIDependency.java
index 46138c78ce0cae4aef59cb0e04b26e33932115c9..fa37811defc26d97e8aecdfca06e01b9a8a93e03 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4NonAPIDependency.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4NonAPIDependency.java
@@ -36,12 +36,12 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wtp.releng.tools.component.ILocation;
+import org.eclipse.wtp.releng.tools.component.adopters.Java2API;
import org.eclipse.wtp.releng.tools.component.api.ComponentXMLVisitor;
import org.eclipse.wtp.releng.tools.component.api.violation.NonAPIDependencyScanner;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.internal.Location;
-import org.eclipse.wtp.releng.tools.component.java.Java2API;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.ComponentUIPlugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
import org.osgi.service.prefs.Preferences;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4UnitTestCoverage.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4UnitTestCoverage.java
index 38d960851b1702c0d080a042066a162f7f090434..a387b1916cedc07181ccda222ec143006484cd3b 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4UnitTestCoverage.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/Scan4UnitTestCoverage.java
@@ -35,8 +35,8 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wtp.releng.tools.component.ILocation;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.ComponentUIPlugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java
index 16488f2417125bfb7bf7b7fa3e271c8940005442..90da850cc4d41bbbbd90db04544690a52a515cd8 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/action/ScanAPI.java
@@ -37,15 +37,15 @@ import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.api.Source;
+import org.eclipse.wtp.releng.tools.component.api.violation.ComponentViolationEmitter;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
import org.eclipse.wtp.releng.tools.component.ui.internal.ScannableComponent;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspacePluginXML;
import org.eclipse.wtp.releng.tools.component.ui.internal.job.ScanComponent;
-import org.eclipse.wtp.releng.tools.component.use.Source;
-import org.eclipse.wtp.releng.tools.component.violation.ComponentViolationEmitter;
public class ScanAPI extends Action implements IActionDelegate
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java
index 30b82cc95ac57d3dab0281d3c67660b9a19c966b..739f93848bc97a4e51030231ced0a1f88039fcf4 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIDialog.java
@@ -31,10 +31,10 @@ import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.wtp.releng.tools.component.ILibrary;
import org.eclipse.wtp.releng.tools.component.IPluginXML;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
public class APIDialog extends Dialog implements ITreeContentProvider
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java
index e863790bc3866f67bc5334715f508a2124441030..7b87a8744f076225719a14153d179caa6d7351ce 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/APIPage.java
@@ -35,9 +35,9 @@ import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Type;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
public class APIPage extends FormPage
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java
index 84f618175fc50f1b73f075c1abddb7c07e98cb7b..b569f3c19d1f86c33255a62595117a36022b82d2 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentPage.java
@@ -42,11 +42,11 @@ import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.wtp.releng.tools.component.model.ComponentDepends;
-import org.eclipse.wtp.releng.tools.component.model.ComponentRef;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Description;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentDepends;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentRef;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Description;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
public class ComponentPage extends FormPage
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java
index 1b492bc73469630f8b831adf3bc06bbc765b508b..17d5665a78d34810d19297c9b725f3e57223245b 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentRefDialog.java
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
public class ComponentRefDialog extends Dialog implements ITreeContentProvider
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java
index eb1daf48ca971a8d5ffb5186a73cb3d0e9ae1984..b5b155fe4253a7c5363f534a2de883d271236e08 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLEditor.java
@@ -22,7 +22,7 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java
index 289072a2aef6308ce20962eb78b7452269435a37..f113659f79ec62c4fb501fa6eaf4efb1a3a4c7d2 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/editor/ComponentXMLProvider.java
@@ -16,12 +16,12 @@ import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wtp.releng.tools.component.model.ComponentDepends;
-import org.eclipse.wtp.releng.tools.component.model.ComponentRef;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Package;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
-import org.eclipse.wtp.releng.tools.component.model.Type;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentDepends;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentRef;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Package;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.Type;
public class ComponentXMLProvider extends LabelProvider implements ITreeContentProvider, ILabelProvider
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java
index 789326a421f69b0c65c61c9e5b0d448ff241f489..04b908dc6485d64a3b514d374fa32a9d348fc0d7 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AbstractModifyMarkersJob.java
@@ -20,10 +20,10 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.wtp.releng.tools.component.api.ClassUse;
+import org.eclipse.wtp.releng.tools.component.api.FieldUse;
+import org.eclipse.wtp.releng.tools.component.api.MethodUse;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
-import org.eclipse.wtp.releng.tools.component.use.ClassUse;
-import org.eclipse.wtp.releng.tools.component.use.FieldUse;
-import org.eclipse.wtp.releng.tools.component.use.MethodUse;
public abstract class AbstractModifyMarkersJob extends Job
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java
index a148be9e1b40e171bfcf522e115a3aec2ed29d9d..af12dda46fb9f264bd804f42fc07dcf3c0da2eed 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/AddComponent.java
@@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
import org.eclipse.wtp.releng.tools.component.ui.internal.ComponentUIPlugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java
index 19f9b8a084965e3aab21c1f7b6c50b0181caa6b0..5462e0ebe0ad48669a7311a75640fcca726fb9be 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/InitComponentManager.java
@@ -27,8 +27,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wtp.releng.tools.component.model.ComponentXML;
-import org.eclipse.wtp.releng.tools.component.model.Plugin;
+import org.eclipse.wtp.releng.tools.component.internal.ComponentXML;
+import org.eclipse.wtp.releng.tools.component.internal.Plugin;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
import org.eclipse.wtp.releng.tools.component.ui.internal.ComponentUIPlugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.WorkspaceFileLocation;
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java
index fe726fd1b24c8e3510b4488f6207c62c72b9bd56..abdd63d615f72c3a41a75541b82545d56c2a25c2 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.ui/src/org/eclipse/wtp/releng/tools/component/ui/internal/job/ScanComponent.java
@@ -27,12 +27,12 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobManager;
+import org.eclipse.wtp.releng.tools.component.api.ClassUse;
+import org.eclipse.wtp.releng.tools.component.api.Source;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
import org.eclipse.wtp.releng.tools.component.ui.internal.ComponentUIPlugin;
import org.eclipse.wtp.releng.tools.component.ui.internal.JavaSourceFinder;
import org.eclipse.wtp.releng.tools.component.ui.internal.ScannableComponent;
-import org.eclipse.wtp.releng.tools.component.use.ClassUse;
-import org.eclipse.wtp.releng.tools.component.use.Source;
public class ScanComponent extends AbstractScanJob
{