[225835] Move non-API elements to internal packages
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.m2m.qvt.oml.common/META-INF/MANIFEST.MF
index b4f2cd6..9fd0eb0 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/META-INF/MANIFEST.MF
@@ -7,16 +7,14 @@
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.m2m.internal.qvt.oml.common,
+ org.eclipse.m2m.internal.qvt.oml.common.emf,
+ org.eclipse.m2m.internal.qvt.oml.common.io,
+ org.eclipse.m2m.internal.qvt.oml.common.io.eclipse,
org.eclipse.m2m.internal.qvt.oml.common.launch,
org.eclipse.m2m.internal.qvt.oml.common.nature,
- org.eclipse.m2m.qvt.oml.common,
- org.eclipse.m2m.qvt.oml.common.emf,
- org.eclipse.m2m.qvt.oml.common.io,
- org.eclipse.m2m.qvt.oml.common.io.eclipse,
- org.eclipse.m2m.qvt.oml.common.launch,
- org.eclipse.m2m.qvt.oml.common.project,
- org.eclipse.m2m.qvt.oml.common.resourcesetprovider,
- org.eclipse.m2m.qvt.oml.common.util
+ org.eclipse.m2m.internal.qvt.oml.common.project,
+ org.eclipse.m2m.internal.qvt.oml.common.resourcesetprovider,
+ org.eclipse.m2m.internal.qvt.oml.common.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.filesystem;visibility:=reexport,
@@ -26,4 +24,4 @@
org.eclipse.emf.ecore,
org.eclipse.m2m.qvt.oml.emf.util,
org.eclipse.ui
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/MDAConstants.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/MDAConstants.java
similarity index 95%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/MDAConstants.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/MDAConstants.java
index cced7b4..f947bb9 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/MDAConstants.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/MDAConstants.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common;
+package org.eclipse.m2m.internal.qvt.oml.common;
public interface MDAConstants {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/MdaException.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/MdaException.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/MdaException.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/MdaException.java
index 4705a45..20a9316 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/MdaException.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/MdaException.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common;
+package org.eclipse.m2m.internal.qvt.oml.common;
/**
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/emf/ExtendedEmfUtil.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/emf/ExtendedEmfUtil.java
similarity index 89%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/emf/ExtendedEmfUtil.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/emf/ExtendedEmfUtil.java
index e801b5b..8866337 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/emf/ExtendedEmfUtil.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/emf/ExtendedEmfUtil.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.emf;
+package org.eclipse.m2m.internal.qvt.oml.common.emf;
import java.io.IOException;
import java.util.Map;
@@ -18,10 +18,10 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.m2m.internal.qvt.oml.common.CommonPlugin;
-import org.eclipse.m2m.qvt.oml.common.MdaException;
-import org.eclipse.m2m.qvt.oml.common.io.CFile;
-import org.eclipse.m2m.qvt.oml.emf.util.EmfException;
-import org.eclipse.m2m.qvt.oml.emf.util.EmfUtil;
+import org.eclipse.m2m.internal.qvt.oml.common.MdaException;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFile;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.EmfException;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.EmfUtil;
/**
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFile.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFile.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFile.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFile.java
index 9be0fca..7f459de 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFile.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFile.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.IOException;
import java.io.InputStream;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFileUtil.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFileUtil.java
similarity index 97%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFileUtil.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFileUtil.java
index a83de96..1d105ef 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFileUtil.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFileUtil.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFolder.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFolder.java
similarity index 93%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFolder.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFolder.java
index 5721301..46bc22d 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CFolder.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CFolder.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.IOException;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CResource.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CResource.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CResource.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CResource.java
index bc6ea21..9822db1 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CResource.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CResource.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.IOException;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CResourceRepositoryContext.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CResourceRepositoryContext.java
similarity index 80%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CResourceRepositoryContext.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CResourceRepositoryContext.java
index 30cecc7..9dbd6a0 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/CResourceRepositoryContext.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/CResourceRepositoryContext.java
@@ -9,11 +9,11 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.m2m.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider;
-import org.eclipse.m2m.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider.IRepositoryContext;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider.IRepositoryContext;
public class CResourceRepositoryContext implements IRepositoryContext {
private CResource resource;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/FileUtil.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/FileUtil.java
similarity index 98%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/FileUtil.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/FileUtil.java
index 4e0694f..9fd3a59 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/FileUtil.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/FileUtil.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.File;
import java.io.FileInputStream;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOFile.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOFile.java
similarity index 97%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOFile.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOFile.java
index d71fba7..bba98ab 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOFile.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOFile.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.File;
import java.io.FileInputStream;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOFolder.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOFolder.java
similarity index 96%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOFolder.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOFolder.java
index 31421c3..13aace9 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOFolder.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOFolder.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.File;
import java.io.IOException;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOResource.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOResource.java
similarity index 97%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOResource.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOResource.java
index a6a1ec8..b694868 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/IOResource.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/IOResource.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io;
+package org.eclipse.m2m.internal.qvt.oml.common.io;
import java.io.File;
import java.io.IOException;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/AbstractBundleResource.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/AbstractBundleResource.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/AbstractBundleResource.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/AbstractBundleResource.java
index 79f08b8..74a04d7 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/AbstractBundleResource.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/AbstractBundleResource.java
@@ -9,13 +9,13 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.m2m.qvt.oml.common.io.CResource;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CResource;
public abstract class AbstractBundleResource implements CResource {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleFile.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleFile.java
similarity index 92%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleFile.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleFile.java
index 10b4b2b..7c2bbee 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleFile.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleFile.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -19,8 +19,8 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.m2m.qvt.oml.common.io.CFile;
-import org.eclipse.m2m.qvt.oml.common.io.CFolder;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFile;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFolder;
public class BundleFile extends AbstractBundleResource implements CFile {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleFolder.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleFolder.java
similarity index 90%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleFolder.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleFolder.java
index b725276..c834012 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleFolder.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleFolder.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
import java.util.ArrayList;
@@ -17,9 +17,9 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.m2m.qvt.oml.common.io.CFile;
-import org.eclipse.m2m.qvt.oml.common.io.CFolder;
-import org.eclipse.m2m.qvt.oml.common.io.CResource;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFile;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFolder;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CResource;
public class BundleFolder extends AbstractBundleResource implements CFolder {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleModuleRegistry.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleModuleRegistry.java
similarity index 98%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleModuleRegistry.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleModuleRegistry.java
index e9514ab..d39193e 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/BundleModuleRegistry.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/BundleModuleRegistry.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseContainer.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseContainer.java
similarity index 90%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseContainer.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseContainer.java
index 0f367cc..472ab62 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseContainer.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseContainer.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
@@ -20,9 +20,9 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
-import org.eclipse.m2m.qvt.oml.common.io.CFile;
-import org.eclipse.m2m.qvt.oml.common.io.CFolder;
-import org.eclipse.m2m.qvt.oml.common.io.CResource;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFile;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFolder;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CResource;
public abstract class EclipseContainer extends EclipseResource implements CFolder {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFile.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFile.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFile.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFile.java
index 5a8cf5a..791dbb9 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFile.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFile.java
@@ -9,13 +9,13 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
import java.io.InputStream;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.m2m.qvt.oml.common.io.CFile;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFile;
/**
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFileUtil.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFileUtil.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFileUtil.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFileUtil.java
index dddb371..1da07f7 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFileUtil.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFileUtil.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.util.ArrayList;
import java.util.List;
@@ -19,7 +19,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.m2m.qvt.oml.common.io.CResource;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CResource;
public class EclipseFileUtil {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFolder.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFolder.java
similarity index 90%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFolder.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFolder.java
index 74d9d12..f649f08 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseFolder.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseFolder.java
@@ -9,13 +9,13 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.m2m.qvt.oml.common.io.CFolder;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFolder;
public class EclipseFolder extends EclipseContainer implements CFolder {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseProject.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseProject.java
similarity index 87%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseProject.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseProject.java
index b0af1a0..f9808f9 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseProject.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseProject.java
@@ -9,12 +9,12 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
import org.eclipse.core.resources.IProject;
-import org.eclipse.m2m.qvt.oml.common.io.CFolder;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFolder;
public class EclipseProject extends EclipseContainer implements CFolder {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseResource.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseResource.java
similarity index 93%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseResource.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseResource.java
index db7cb0a..e2b0d29 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseResource.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseResource.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.File;
import java.io.IOException;
@@ -20,8 +20,8 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.m2m.qvt.oml.common.io.CFolder;
-import org.eclipse.m2m.qvt.oml.common.io.CResource;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFolder;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CResource;
public class EclipseResource implements CResource {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseRoot.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseRoot.java
similarity index 87%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseRoot.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseRoot.java
index 49a9d43..5b7507a 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/EclipseRoot.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/EclipseRoot.java
@@ -9,12 +9,12 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.m2m.qvt.oml.common.io.CFolder;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFolder;
public class EclipseRoot extends EclipseContainer implements CFolder {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/MetamodelRegistryProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/MetamodelRegistryProvider.java
new file mode 100644
index 0000000..2bbcf9b
--- /dev/null
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/MetamodelRegistryProvider.java
@@ -0,0 +1,14 @@
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
+
+import org.eclipse.m2m.internal.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.mmregistry.MetamodelRegistry;
+
+/**
+ * @author aigdalov
+ * Created on Oct 10, 2007
+ */
+public class MetamodelRegistryProvider implements IMetamodelRegistryProvider {
+ public MetamodelRegistry getRegistry(IRepositoryContext context) {
+ return MetamodelRegistry.getInstance();
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/WorkspaceMetamodelRegistryProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/WorkspaceMetamodelRegistryProvider.java
similarity index 88%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/WorkspaceMetamodelRegistryProvider.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/WorkspaceMetamodelRegistryProvider.java
index 8b79c6f..6db0b5e 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/WorkspaceMetamodelRegistryProvider.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/io/eclipse/WorkspaceMetamodelRegistryProvider.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
+package org.eclipse.m2m.internal.qvt.oml.common.io.eclipse;
import java.io.IOException;
import java.util.HashMap;
@@ -26,12 +26,12 @@
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.m2m.internal.qvt.oml.common.CommonPlugin;
-import org.eclipse.m2m.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider;
-import org.eclipse.m2m.qvt.oml.emf.util.mmregistry.MetamodelRegistry;
-import org.eclipse.m2m.qvt.oml.emf.util.mmregistry.WorskpaceMetamodelProvider;
-import org.eclipse.m2m.qvt.oml.emf.util.urimap.MappingContainer;
-import org.eclipse.m2m.qvt.oml.emf.util.urimap.MetamodelURIMappingHelper;
-import org.eclipse.m2m.qvt.oml.emf.util.urimap.URIMapping;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.mmregistry.MetamodelRegistry;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.mmregistry.WorskpaceMetamodelProvider;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.urimap.MappingContainer;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.urimap.MetamodelURIMappingHelper;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.urimap.URIMapping;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/BaseProcess.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/BaseProcess.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/BaseProcess.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/BaseProcess.java
index 77f51a5..0beb57b 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/BaseProcess.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/BaseProcess.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.debug.core.model.IProcess;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/EmptyDebugTarget.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/EmptyDebugTarget.java
similarity index 98%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/EmptyDebugTarget.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/EmptyDebugTarget.java
index 2e3d5b1..e2adcc4 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/EmptyDebugTarget.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/EmptyDebugTarget.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import org.eclipse.core.resources.IMarkerDelta;
import org.eclipse.core.runtime.PlatformObject;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/SafeRunner.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/SafeRunner.java
similarity index 91%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/SafeRunner.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/SafeRunner.java
index 79e0928..0a25bb0 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/SafeRunner.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/SafeRunner.java
@@ -9,10 +9,10 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.m2m.qvt.oml.common.launch.BaseProcess.IRunnable;
+import org.eclipse.m2m.internal.qvt.oml.common.launch.BaseProcess.IRunnable;
public class SafeRunner {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/ShallowProcess.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/ShallowProcess.java
similarity index 97%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/ShallowProcess.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/ShallowProcess.java
index 381dbcd..4c9b19e 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/ShallowProcess.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/ShallowProcess.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/StreamsProxy.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/StreamsProxy.java
similarity index 95%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/StreamsProxy.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/StreamsProxy.java
index 5ecf041..7081ec5 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/StreamsProxy.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/StreamsProxy.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import java.io.IOException;
import java.io.Writer;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/TargetUriData.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/TargetUriData.java
similarity index 96%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/TargetUriData.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/TargetUriData.java
index 544afb1..3b6df8a 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/TargetUriData.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/TargetUriData.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/WriterMonitor.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/WriterMonitor.java
similarity index 96%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/WriterMonitor.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/WriterMonitor.java
index 8e55fdd..f2bfb91 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/WriterMonitor.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/WriterMonitor.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import java.io.IOException;
import java.io.Writer;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/WriterOutputStream.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/WriterOutputStream.java
similarity index 96%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/WriterOutputStream.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/WriterOutputStream.java
index 8e3b796..1be33c9 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/launch/WriterOutputStream.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/launch/WriterOutputStream.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.launch;
+package org.eclipse.m2m.internal.qvt.oml.common.launch;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/CompiledTransformation.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/CompiledTransformation.java
similarity index 91%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/CompiledTransformation.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/CompiledTransformation.java
index 2f97dc1..0ecd885 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/CompiledTransformation.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/CompiledTransformation.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
public interface CompiledTransformation extends Transformation {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/IRegistryConstants.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/IRegistryConstants.java
similarity index 94%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/IRegistryConstants.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/IRegistryConstants.java
index 907eb64..713eed2 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/IRegistryConstants.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/IRegistryConstants.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
public interface IRegistryConstants {
public static final String TRANSFORMATION = "transformation"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/JavaProjectUtil.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/JavaProjectUtil.java
similarity index 96%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/JavaProjectUtil.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/JavaProjectUtil.java
index 19452a1..41723e7 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/JavaProjectUtil.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/JavaProjectUtil.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IClasspathEntry;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Messages.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Messages.java
similarity index 87%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Messages.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Messages.java
index 7ee6dfe..b307aad 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Messages.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Messages.java
@@ -9,12 +9,12 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.m2m.qvt.oml.common.project.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.m2m.internal.qvt.oml.common.project.messages"; //$NON-NLS-1$
public static String TransformationProject_CreateExtensionError;
public static String TransformationProject_AddImportFailed;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/NatureUtils.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/NatureUtils.java
similarity index 98%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/NatureUtils.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/NatureUtils.java
index e948b0f..0473722 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/NatureUtils.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/NatureUtils.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Pair.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Pair.java
similarity index 95%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Pair.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Pair.java
index c800803..49150fa 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Pair.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Pair.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
public class Pair<A, B> {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/PluginUtil.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/PluginUtil.java
similarity index 98%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/PluginUtil.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/PluginUtil.java
index cd1cbbf..223ab1d 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/PluginUtil.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/PluginUtil.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -18,7 +18,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.m2m.qvt.oml.common.MdaException;
+import org.eclipse.m2m.internal.qvt.oml.common.MdaException;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.core.IEditableModel;
import org.eclipse.pde.core.IModel;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/ProjectDependencyHelper.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/ProjectDependencyHelper.java
similarity index 97%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/ProjectDependencyHelper.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/ProjectDependencyHelper.java
index f8f17ec..f73583c 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/ProjectDependencyHelper.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/ProjectDependencyHelper.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
import java.util.Collections;
import java.util.LinkedHashSet;
@@ -20,7 +20,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.eclipse.m2m.internal.qvt.oml.common.nature.TransformationNature;
-import org.eclipse.m2m.qvt.oml.emf.util.Logger;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.Logger;
import org.eclipse.pde.core.plugin.IPluginImport;
import org.eclipse.pde.core.plugin.IPluginModelBase;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Transformation.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Transformation.java
similarity index 91%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Transformation.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Transformation.java
index aebd72d..5f9955a 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/Transformation.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/Transformation.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
public interface Transformation {
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/TransformationRegistry.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/TransformationRegistry.java
similarity index 95%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/TransformationRegistry.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/TransformationRegistry.java
index ca94f9b..f12d46b 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/TransformationRegistry.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/TransformationRegistry.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.project;
+package org.eclipse.m2m.internal.qvt.oml.common.project;
import java.util.ArrayList;
import java.util.List;
@@ -19,10 +19,10 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.m2m.qvt.oml.common.MdaException;
-import org.eclipse.m2m.qvt.oml.emf.util.EmfException;
-import org.eclipse.m2m.qvt.oml.emf.util.EmfUtil;
-import org.eclipse.m2m.qvt.oml.emf.util.Logger;
+import org.eclipse.m2m.internal.qvt.oml.common.MdaException;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.EmfException;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.EmfUtil;
+import org.eclipse.m2m.internal.qvt.oml.emf.util.Logger;
import org.eclipse.osgi.util.NLS;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/messages.properties b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/messages.properties
similarity index 100%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/project/messages.properties
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/project/messages.properties
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/AbstractResourceSetProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/AbstractResourceSetProvider.java
similarity index 95%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/AbstractResourceSetProvider.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/AbstractResourceSetProvider.java
index 0508f91..a330381 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/AbstractResourceSetProvider.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/AbstractResourceSetProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.resourcesetprovider;
+package org.eclipse.m2m.internal.qvt.oml.common.resourcesetprovider;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/IResourceSetProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/IResourceSetProvider.java
similarity index 87%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/IResourceSetProvider.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/IResourceSetProvider.java
index b04a86a..1717e46 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/IResourceSetProvider.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/IResourceSetProvider.java
@@ -8,10 +8,10 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.resourcesetprovider;
+package org.eclipse.m2m.internal.qvt.oml.common.resourcesetprovider;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.m2m.qvt.oml.common.io.CFile;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFile;
/**
* @author aigdalov
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/IResourceSetProviderListener.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/IResourceSetProviderListener.java
similarity index 90%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/IResourceSetProviderListener.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/IResourceSetProviderListener.java
index 62b74e7..5c7c3f2 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/IResourceSetProviderListener.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/IResourceSetProviderListener.java
@@ -8,7 +8,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
- package org.eclipse.m2m.qvt.oml.common.resourcesetprovider;
+ package org.eclipse.m2m.internal.qvt.oml.common.resourcesetprovider;
/**
* @author aigdalov
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/ResourceSetProviderRegistry.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/ResourceSetProviderRegistry.java
similarity index 97%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/ResourceSetProviderRegistry.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/ResourceSetProviderRegistry.java
index 7ad08e0..0f60efa 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/resourcesetprovider/ResourceSetProviderRegistry.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/resourcesetprovider/ResourceSetProviderRegistry.java
@@ -8,7 +8,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.resourcesetprovider;
+package org.eclipse.m2m.internal.qvt.oml.common.resourcesetprovider;
import java.util.TreeMap;
@@ -21,7 +21,7 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.m2m.internal.qvt.oml.common.CommonPlugin;
-import org.eclipse.m2m.qvt.oml.common.io.CFile;
+import org.eclipse.m2m.internal.qvt.oml.common.io.CFile;
import org.eclipse.ui.IPluginContribution;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.activities.ActivityManagerEvent;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/util/LineNumberProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/util/LineNumberProvider.java
similarity index 95%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/util/LineNumberProvider.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/util/LineNumberProvider.java
index 28abb9b..f9c36d2 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/util/LineNumberProvider.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/util/LineNumberProvider.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.util;
+package org.eclipse.m2m.internal.qvt.oml.common.util;
/**
* An interface for objects providing lines
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/util/StringLineNumberProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/util/StringLineNumberProvider.java
similarity index 98%
rename from plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/util/StringLineNumberProvider.java
rename to plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/util/StringLineNumberProvider.java
index 243c0cc..64b22eb 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/util/StringLineNumberProvider.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/internal/qvt/oml/common/util/StringLineNumberProvider.java
@@ -9,7 +9,7 @@
* Contributors:
* Borland Software Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2m.qvt.oml.common.util;
+package org.eclipse.m2m.internal.qvt.oml.common.util;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/MetamodelRegistryProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/MetamodelRegistryProvider.java
deleted file mode 100644
index fffe62b..0000000
--- a/plugins/org.eclipse.m2m.qvt.oml.common/src/org/eclipse/m2m/qvt/oml/common/io/eclipse/MetamodelRegistryProvider.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.m2m.qvt.oml.common.io.eclipse;
-
-import org.eclipse.m2m.qvt.oml.emf.util.mmregistry.IMetamodelRegistryProvider;
-import org.eclipse.m2m.qvt.oml.emf.util.mmregistry.MetamodelRegistry;
-
-/**
- * @author aigdalov
- * Created on Oct 10, 2007
- */
-public class MetamodelRegistryProvider implements IMetamodelRegistryProvider {
- public MetamodelRegistry getRegistry(IRepositoryContext context) {
- return MetamodelRegistry.getInstance();
- }
-}
\ No newline at end of file
