diff options
| author | cbridgha | 2005-02-14 20:36:05 +0000 |
|---|---|---|
| committer | cbridgha | 2005-02-14 20:36:05 +0000 |
| commit | 1f9050db3e03a588cacab6059f1ac5ac4ba3986c (patch) | |
| tree | 296fc5ae78893195d388da5aac4103ad5ff62d74 | |
| parent | 01045c03dc2800dadc0d74904fa1ab50ba1b3383 (diff) | |
| download | webtools.javaee-1f9050db3e03a588cacab6059f1ac5ac4ba3986c.tar.gz webtools.javaee-1f9050db3e03a588cacab6059f1ac5ac4ba3986c.tar.xz webtools.javaee-1f9050db3e03a588cacab6059f1ac5ac4ba3986c.zip | |
j2ee core impl and util packages made internal
329 files changed, 568 insertions, 568 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java index 3c155532a..3ad128cd4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java @@ -23,7 +23,6 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.util.Defaultable; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; @@ -37,6 +36,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; +import org.eclipse.jst.j2ee.internal.common.util.Defaultable; import org.eclipse.jst.j2ee.webapplication.FilterMapping; import org.eclipse.wst.common.emf.utilities.CopyGroup; import org.eclipse.wst.common.emf.utilities.EtoolsCopySession; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java index c501891e4..714955afa 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java @@ -19,10 +19,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.ClientModuleRef; @@ -43,13 +40,16 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl.LooseconfigPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java index c02a69441..a3619f4ab 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java @@ -44,11 +44,9 @@ import org.eclipse.jst.j2ee.application.JavaClientModule; import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.application.WebModule; import org.eclipse.jst.j2ee.client.ApplicationClient; -import org.eclipse.jst.j2ee.client.impl.ApplicationClientResourceFactory; import org.eclipse.jst.j2ee.common.EjbRef; import org.eclipse.jst.j2ee.common.SecurityRole; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; @@ -75,11 +73,13 @@ import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EJBResource; import org.eclipse.jst.j2ee.ejb.EjbPackage; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; -import org.eclipse.jst.j2ee.ejb.impl.EJBJarResourceFactory; +import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; +import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory; +import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory; import org.eclipse.jst.j2ee.jca.Connector; -import org.eclipse.jst.j2ee.jca.impl.ConnectorResourceFactory; import org.eclipse.jst.j2ee.webapplication.WebApp; -import org.eclipse.jst.j2ee.webapplication.impl.WebAppResourceFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java index 21beb3c8a..c61470fac 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java @@ -18,9 +18,6 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.impl.JavaRefPackageImpl; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; @@ -31,11 +28,14 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java index 3b7445cf2..e6883e123 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java @@ -34,9 +34,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory; -import org.eclipse.jst.j2ee.common.impl.J2EEResouceFactorySaxRegistry; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryDomRegistry; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; @@ -53,6 +50,9 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIteratorImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfigRegister; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResouceFactorySaxRegistry; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryDomRegistry; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.wst.common.emf.utilities.ExtendedEcoreUtil; import com.ibm.wtp.common.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPBeanClassVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPBeanClassVRule.java index 19f5e8dd2..18a95f3a5 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPBeanClassVRule.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/CMPBeanClassVRule.java @@ -24,7 +24,7 @@ import org.eclipse.jst.j2ee.ejb.CMRField; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.Entity; -import org.eclipse.jst.j2ee.ejb.impl.LocalModelledPersistentAttributeFilter; +import org.eclipse.jst.j2ee.internal.ejb.impl.LocalModelledPersistentAttributeFilter; import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.ValidationException; diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java index abd1a9093..8f576de5d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java @@ -29,7 +29,6 @@ import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.application.WebModule; import org.eclipse.jst.j2ee.client.ApplicationClient; -import org.eclipse.jst.j2ee.client.impl.ApplicationClientImpl; import org.eclipse.jst.j2ee.common.EJBLocalRef; import org.eclipse.jst.j2ee.common.EjbRef; import org.eclipse.jst.j2ee.common.MessageDestinationRef; @@ -38,7 +37,6 @@ import org.eclipse.jst.j2ee.common.ResourceRef; import org.eclipse.jst.j2ee.common.SecurityRole; import org.eclipse.jst.j2ee.common.SecurityRoleRef; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.EjbRefImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef; @@ -49,6 +47,8 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadExc import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl; +import org.eclipse.jst.j2ee.internal.common.impl.EjbRefImpl; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; import org.eclipse.wst.validation.core.IFileDelta; diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java index 13df0d985..a04b68550 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java @@ -19,8 +19,8 @@ import java.util.Set; import org.eclipse.emf.common.util.EList; import org.eclipse.jst.j2ee.common.EjbRef; -import org.eclipse.jst.j2ee.common.impl.ResourceRefImpl; -import org.eclipse.jst.j2ee.common.impl.SecurityRoleImpl; +import org.eclipse.jst.j2ee.internal.common.impl.ResourceRefImpl; +import org.eclipse.jst.j2ee.internal.common.impl.SecurityRoleImpl; import org.eclipse.wst.validation.core.IFileDelta; import org.eclipse.wst.validation.core.IHelper; import org.eclipse.wst.validation.core.IMessage; diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java index 0b189b46e..ea2616a4d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java @@ -42,8 +42,8 @@ import org.eclipse.jst.j2ee.ejb.QueryMethod; import org.eclipse.jst.j2ee.ejb.Session; import org.eclipse.jst.j2ee.ejb.SessionType; import org.eclipse.jst.j2ee.ejb.TransactionType; -import org.eclipse.jst.j2ee.ejb.impl.LocalModelledPersistentAttributeFilter; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.ejb.impl.LocalModelledPersistentAttributeFilter; import com.ibm.wtp.common.logger.LogEntry; import com.ibm.wtp.common.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java index a160fc278..b537e2e5b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java @@ -25,13 +25,13 @@ import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.j2ee.common.EnvEntry; import org.eclipse.jst.j2ee.common.SecurityRole; import org.eclipse.jst.j2ee.common.SecurityRoleRef; -import org.eclipse.jst.j2ee.common.impl.EJBLocalRefImpl; -import org.eclipse.jst.j2ee.common.impl.EjbRefImpl; -import org.eclipse.jst.j2ee.common.impl.ResourceRefImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.EJBLocalRefImpl; +import org.eclipse.jst.j2ee.internal.common.impl.EjbRefImpl; +import org.eclipse.jst.j2ee.internal.common.impl.ResourceRefImpl; import org.eclipse.jst.j2ee.webapplication.AuthConstraint; import org.eclipse.jst.j2ee.webapplication.ContextParam; import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java index 32f5c2ddf..ba302e1f6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java @@ -21,7 +21,7 @@ public interface ApplicationFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - ApplicationFactory eINSTANCE = new org.eclipse.jst.j2ee.application.impl.ApplicationFactoryImpl(); + ApplicationFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.application.impl.ApplicationFactoryImpl(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationPackage.java index a9285cf87..53dc8cfee 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationPackage.java @@ -260,7 +260,7 @@ public interface ApplicationPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - ApplicationPackage eINSTANCE = org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl.init(); + ApplicationPackage eINSTANCE = org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl.init(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java index ddd859479..abdcd9d43 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java @@ -21,7 +21,7 @@ public interface ClientFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - ClientFactory eINSTANCE = new org.eclipse.jst.j2ee.client.impl.ClientFactoryImpl(); + ClientFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientPackage.java index 4e62f927e..42056b1cc 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientPackage.java @@ -176,7 +176,7 @@ public interface ClientPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - ClientPackage eINSTANCE = org.eclipse.jst.j2ee.client.impl.ClientPackageImpl.init(); + ClientPackage eINSTANCE = org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl.init(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java index c452ae644..bdf88055c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java @@ -27,7 +27,7 @@ public interface CommonFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - CommonFactory eINSTANCE = new org.eclipse.jst.j2ee.common.impl.CommonFactoryImpl(); + CommonFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.common.impl.CommonFactoryImpl(); /** * Returns a new object of class '<em>Ejb Ref</em>'. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonPackage.java index 589739e47..8d1739e7a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonPackage.java @@ -1234,7 +1234,7 @@ public interface CommonPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - CommonPackage eINSTANCE = org.eclipse.jst.j2ee.common.impl.CommonPackageImpl.init(); + CommonPackage eINSTANCE = org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl.init(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEXMIResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEXMIResourceFactory.java index ca6a101aa..b95c677a1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEXMIResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/J2EEXMIResourceFactory.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.common; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.wst.common.internal.emf.resource.CompatibilityResourceFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java index 234b7a8db..41840dc77 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java @@ -23,7 +23,7 @@ public interface EjbFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - EjbFactory eINSTANCE = new org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl(); + EjbFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl(); MethodElement createMethodElement(String aSignature) ; MethodElement createMethodElementFrom(Method method) ; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java index febf047d1..802cc562c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java @@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jem.java.Method; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; /** * @author blancett diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbPackage.java index c617c465e..7ddc4920e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbPackage.java @@ -1906,7 +1906,7 @@ public interface EjbPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - EjbPackage eINSTANCE = org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl.init(); + EjbPackage eINSTANCE = org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl.init(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java index 812abe481..6cc82a202 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java @@ -17,27 +17,27 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationResourceFactory; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ApplicationClientResourceFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.J2EEXMIResourceFactory; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EJBJarResourceFactory; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; -import org.eclipse.jst.j2ee.ejb.util.EJBAttributeMaintenanceFactoryImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceFactory; +import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; +import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.util.EJBAttributeMaintenanceFactoryImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.ConnectorResourceFactory; import org.eclipse.jst.j2ee.jsp.JspPackage; import org.eclipse.jst.j2ee.taglib.TaglibPackage; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebAppResourceFactory; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.WebServicesClientResourceFactory; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.WebServicesClientResourceFactory; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; import org.eclipse.jst.j2ee.webservice.wsdd.WsddResourceFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationFactoryImpl.java index 9d2f92851..99b27f918 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationImpl.java index 5ba83acd2..df318f4d3 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import java.util.Collection; import java.util.List; @@ -29,9 +29,9 @@ import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.common.J2EEVersionResource; import org.eclipse.jst.j2ee.common.SecurityRole; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; -import org.eclipse.jst.j2ee.common.util.CommonUtil; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; import org.eclipse.wst.common.internal.emf.utilities.StringUtil; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationPackageImpl.java index 5ee284b9e..21183c187 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -26,25 +26,25 @@ import org.eclipse.jst.j2ee.application.JavaClientModule; import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.application.WebModule; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; public class ApplicationPackageImpl extends EPackageImpl implements ApplicationPackage, EPackage { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java index e775a065d..877d54282 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.RendererFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceImpl.java index 10d2584e6..550a718ec 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ApplicationResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceImpl.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.ApplicationResource; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.application.ApplicationTranslator; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ConnectorModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ConnectorModuleImpl.java index 3911066d3..8cb3876dd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ConnectorModuleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ConnectorModuleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/EjbModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/EjbModuleImpl.java index 7db74a7ba..2eb4f7f2d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/EjbModuleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/EjbModuleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/JavaClientModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/JavaClientModuleImpl.java index d81ff6387..40b606b77 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/JavaClientModuleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/JavaClientModuleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ModuleImpl.java index 969758a8a..af08b5cbb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/ModuleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ModuleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/WebModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/WebModuleImpl.java index 6b7342406..6ae5d9ab8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/impl/WebModuleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/WebModuleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.impl; +package org.eclipse.jst.j2ee.internal.application.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/util/ApplicationAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationAdapterFactory.java index 306d886d5..17ec93d6e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/util/ApplicationAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.util; +package org.eclipse.jst.j2ee.internal.application.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/util/ApplicationSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationSwitch.java index 390d2ca2e..7e0e14bff 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/util/ApplicationSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.util; +package org.eclipse.jst.j2ee.internal.application.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ApplicationClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientImpl.java index 205ba4663..e1a1b3046 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ApplicationClientImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.client.impl; +package org.eclipse.jst.j2ee.internal.client.impl; import java.util.Collection; @@ -33,9 +33,9 @@ import org.eclipse.jst.j2ee.common.MessageDestinationRef; import org.eclipse.jst.j2ee.common.ResourceEnvRef; import org.eclipse.jst.j2ee.common.ResourceRef; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; -import org.eclipse.jst.j2ee.common.util.CommonUtil; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ApplicationClientResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceFactory.java index 4e3ee891e..b3c01f004 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ApplicationClientResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceFactory.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.client.impl; +package org.eclipse.jst.j2ee.internal.client.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.RendererFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ApplicationClientResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceImpl.java index e549baced..a772a6fb1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ApplicationClientResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceImpl.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.client.impl; +package org.eclipse.jst.j2ee.internal.client.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.jst.j2ee.client.ApplicationClient; import org.eclipse.jst.j2ee.client.ApplicationClientResource; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.client.ApplicationClientTranslator; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ClientFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientFactoryImpl.java index c89529706..e1ea503b0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ClientFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.client.impl; +package org.eclipse.jst.j2ee.internal.client.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ClientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientPackageImpl.java index e840d087f..55c7491fd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/impl/ClientPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.client.impl; +package org.eclipse.jst.j2ee.internal.client.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -20,30 +20,30 @@ import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ApplicationClient; import org.eclipse.jst.j2ee.client.ClientFactory; import org.eclipse.jst.j2ee.client.ClientPackage; import org.eclipse.jst.j2ee.client.ResAuthApplicationType; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; import org.eclipse.jst.j2ee.internal.J2EEInit; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; public class ClientPackageImpl extends EPackageImpl implements ClientPackage, EPackage { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/util/ClientAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientAdapterFactory.java index 71a357cc3..6006b02f4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/util/ClientAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.client.util; +package org.eclipse.jst.j2ee.internal.client.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/util/ClientSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientSwitch.java index c408702eb..ccaca19c1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/util/ClientSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.client.util; +package org.eclipse.jst.j2ee.internal.client.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/CommonFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonFactoryImpl.java index 5d08caf1e..7530eedb4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/CommonFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/CommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonPackageImpl.java index 7567787d5..53a52ce05 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/CommonPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -20,9 +20,7 @@ import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup; @@ -53,21 +51,23 @@ import org.eclipse.jst.j2ee.common.SecurityRole; import org.eclipse.jst.j2ee.common.SecurityRoleRef; import org.eclipse.jst.j2ee.common.UseCallerIdentity; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; public class CommonPackageImpl extends EPackageImpl implements CommonPackage, EPackage { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/CompatibilityDescriptionGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CompatibilityDescriptionGroupImpl.java index fe517929a..94d0ebd4c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/CompatibilityDescriptionGroupImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CompatibilityDescriptionGroupImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DescriptionGroupAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupAdapter.java index 8349ac2fe..a3d2f3ee4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DescriptionGroupAdapter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupAdapter.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DescriptionGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupImpl.java index 5da7ec05f..4927789cd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DescriptionGroupImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DescriptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionImpl.java index f59b62501..15a022d1c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DescriptionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DisplayNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DisplayNameImpl.java index d2c29d765..efa84c7b0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/DisplayNameImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DisplayNameImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/EJBLocalRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EJBLocalRefImpl.java index 768b7c9dc..bc40268b7 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/EJBLocalRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EJBLocalRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/EjbRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EjbRefImpl.java index fba104405..79058066d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/EjbRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EjbRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/EnvEntryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EnvEntryImpl.java index 949b15b11..a1b04e285 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/EnvEntryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EnvEntryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/IconTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IconTypeImpl.java index 7ec4f749d..4640186d3 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/IconTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IconTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/IdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IdentityImpl.java index c7eb66fe9..3a2515b39 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/IdentityImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IdentityImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/J2EEResouceFactorySaxRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResouceFactorySaxRegistry.java index 52d2ccca0..26bcaa65d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/J2EEResouceFactorySaxRegistry.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResouceFactorySaxRegistry.java @@ -14,15 +14,15 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.common.impl; -import org.eclipse.jst.j2ee.application.impl.ApplicationResourceFactory; -import org.eclipse.jst.j2ee.client.impl.ApplicationClientResourceFactory; -import org.eclipse.jst.j2ee.ejb.impl.EJBJarResourceFactory; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.jst.j2ee.internal.J2EEConstants; -import org.eclipse.jst.j2ee.jca.impl.ConnectorResourceFactory; -import org.eclipse.jst.j2ee.webapplication.impl.WebAppResourceFactory; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceFactory; +import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory; +import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory; +import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory; import org.eclipse.jst.j2ee.webservice.WebServiceConstants; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.WebServicesClientResourceFactory; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.WebServicesClientResourceFactory; import org.eclipse.jst.j2ee.webservice.wsdd.WsddResourceFactory; import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/J2EEResourceFactoryDomRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryDomRegistry.java index 9ec43b872..8841849a2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/J2EEResourceFactoryDomRegistry.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryDomRegistry.java @@ -14,16 +14,16 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; -import org.eclipse.jst.j2ee.application.impl.ApplicationResourceFactory; -import org.eclipse.jst.j2ee.client.impl.ApplicationClientResourceFactory; -import org.eclipse.jst.j2ee.ejb.impl.EJBJarResourceFactory; import org.eclipse.jst.j2ee.internal.J2EEConstants; -import org.eclipse.jst.j2ee.jca.impl.ConnectorResourceFactory; -import org.eclipse.jst.j2ee.webapplication.impl.WebAppResourceFactory; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceFactory; +import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory; +import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory; +import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory; import org.eclipse.jst.j2ee.webservice.WebServiceConstants; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.WebServicesClientResourceFactory; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.WebServicesClientResourceFactory; import org.eclipse.jst.j2ee.webservice.wsdd.WsddResourceFactory; import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory; import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/J2EEResourceFactoryRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryRegistry.java index b28c26e15..24ad1e8ff 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/J2EEResourceFactoryRegistry.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryRegistry.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/JNDIEnvRefsGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/JNDIEnvRefsGroupImpl.java index 6b1a26bd8..100a3a3cd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/JNDIEnvRefsGroupImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/JNDIEnvRefsGroupImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ListenerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ListenerImpl.java index ba4aca53e..6d151471c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ListenerImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ListenerImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/MessageDestinationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationImpl.java index 816c6818e..2ef57e0e5 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/MessageDestinationImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/MessageDestinationRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationRefImpl.java index 6a981aa40..beab489c1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/MessageDestinationRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ParamValueImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ParamValueImpl.java index 7b558869f..52edb1b67 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ParamValueImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ParamValueImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/QNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/QNameImpl.java index 58594e70a..0b1d82df2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/QNameImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/QNameImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ResourceEnvRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceEnvRefImpl.java index 72a97b3fd..14f170c25 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ResourceEnvRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceEnvRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ResourceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceRefImpl.java index 6397fc3fc..5687506c8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/ResourceRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/RunAsSpecifiedIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/RunAsSpecifiedIdentityImpl.java index b6ef36520..64334991f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/RunAsSpecifiedIdentityImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/RunAsSpecifiedIdentityImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/SecurityIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityIdentityImpl.java index 92397c421..44c76393f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/SecurityIdentityImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityIdentityImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/SecurityRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleImpl.java index caed618ef..89c4c0e55 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/SecurityRoleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/SecurityRoleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleRefImpl.java index 47488a2b9..c0bbf15c7 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/SecurityRoleRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/UseCallerIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/UseCallerIdentityImpl.java index c666782ad..3fe145fa9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/UseCallerIdentityImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/UseCallerIdentityImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/XMLResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceFactory.java index 3d5db8a4d..e4b70f5d5 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/XMLResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/XMLResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java index 532ac42b6..96db6454c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/impl/XMLResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.impl; +package org.eclipse.jst.j2ee.internal.common.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/CommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonAdapterFactory.java index 778a833a3..b31c5d09c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/CommonAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/CommonSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonSwitch.java index 9eaeb7072..726193332 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/CommonSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/CommonUtil.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonUtil.java index c72ad7a39..a2f33ed16 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/CommonUtil.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonUtil.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.jst.j2ee.application.impl.ApplicationFactoryImpl; -import org.eclipse.jst.j2ee.client.impl.ClientFactoryImpl; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationFactoryImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaFactoryImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationFactoryImpl; import org.eclipse.jst.j2ee.internal.xml.J2EEXMLResourceHandler; -import org.eclipse.jst.j2ee.jca.impl.JcaFactoryImpl; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationFactoryImpl; public class CommonUtil { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/Defaultable.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultable.java index 77de336c4..af0cc258d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/Defaultable.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultable.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; import org.eclipse.emf.common.notify.Notifier; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/DefaultedAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/DefaultedAdapterImpl.java index 69af9e856..3e72e5605 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/DefaultedAdapterImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/DefaultedAdapterImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/Defaultor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultor.java index 66ce8bf80..6b4b3b5ff 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/Defaultor.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; /** * Insert the type's description here. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/IDUtility.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/IDUtility.java index 1e1557950..ba0207015 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/IDUtility.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/IDUtility.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/XmlSpecifiedDataAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/XmlSpecifiedDataAdapter.java index 8fbb0f968..1fbeac9f4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/util/XmlSpecifiedDataAdapter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/XmlSpecifiedDataAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.util; +package org.eclipse.jst.j2ee.internal.common.util; /** * Insert the type's description here. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/AbstractRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRelationshipRoleAttributeFilter.java index c5877e4ad..12b0e7bc8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/AbstractRelationshipRoleAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRelationshipRoleAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/AbstractRequiredRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRequiredRelationshipRoleFilter.java index 5b07265b3..c9aab735c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/AbstractRequiredRelationshipRoleFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRequiredRelationshipRoleFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ActivationConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigImpl.java index 628368b9e..6277a9a53 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ActivationConfigImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ActivationConfigPropertyImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigPropertyImpl.java index a670f2315..2b2d95050 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ActivationConfigPropertyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigPropertyImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/AssemblyDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AssemblyDescriptorImpl.java index 9cf2bbae9..86a55cd13 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/AssemblyDescriptorImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AssemblyDescriptorImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/CMPAttributeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMPAttributeImpl.java index 90c147ffc..5d7a48b9f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/CMPAttributeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMPAttributeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; import java.util.Collections; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/CMRFieldImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMRFieldImpl.java index 46c6ba3ab..e0e633999 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/CMRFieldImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMRFieldImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ContainerManagedEntityFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityFilter.java index 8853cbf6a..6d9a534e6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ContainerManagedEntityFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collections; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ContainerManagedEntityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityImpl.java index 6a5341c44..2b9eea414 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ContainerManagedEntityImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; @@ -51,8 +51,8 @@ import org.eclipse.jst.j2ee.ejb.EjbFactory; import org.eclipse.jst.j2ee.ejb.EjbPackage; import org.eclipse.jst.j2ee.ejb.MethodElementKind; import org.eclipse.jst.j2ee.ejb.Query; -import org.eclipse.jst.j2ee.ejb.util.CMPKeySynchronizationAdapter; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.ejb.util.CMPKeySynchronizationAdapter; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJB20FlattenedRoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJB20FlattenedRoleShapeStrategy.java index 318c53884..870261ab9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJB20FlattenedRoleShapeStrategy.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJB20FlattenedRoleShapeStrategy.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBJarImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarImpl.java index cc84e5a98..6a00e4651 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBJarImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; @@ -28,8 +28,6 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.j2ee.common.EjbRef; import org.eclipse.jst.j2ee.common.J2EEVersionResource; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; -import org.eclipse.jst.j2ee.common.util.CommonUtil; import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor; import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; @@ -42,6 +40,8 @@ import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.Entity; import org.eclipse.jst.j2ee.ejb.Relationships; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; /** * The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBJarResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarResourceFactory.java index 87a2631a1..0abba0d8c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBJarResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarResourceFactory.java @@ -12,12 +12,12 @@ * Created on Mar 27, 2003 * */ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.RendererFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBMethodCategoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBMethodCategoryImpl.java index 9988a0a76..d964fcfe2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBMethodCategoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBMethodCategoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBRelationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationImpl.java index 7336d3ea4..7e53c4913 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBRelationImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBRelationshipRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java index 82c67b2cf..646461377 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBRelationshipRoleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.lang.reflect.Constructor; import java.util.Collection; @@ -85,7 +85,7 @@ public class EJBRelationshipRoleImpl extends EObjectImpl implements EJBRelations protected EList fAttributes = null; protected String fName = null; protected IRoleShapeStrategy roleShapeStrategy; - private static final String ROLE_STRATEGY_CLASS_NAME = "org.eclipse.jst.j2ee.ejb.impl.EJB20FlattenedRoleShapeStrategy"; //$NON-NLS-1$ + private static final String ROLE_STRATEGY_CLASS_NAME = "org.eclipse.jst.j2ee.internal.ejb.impl.EJB20FlattenedRoleShapeStrategy"; //$NON-NLS-1$ private static final String COMMON_ROLE_CLASS_NAME = "org.eclipse.jst.j2ee.ejb.CommonRelationshipRole"; //$NON-NLS-1$ private static Class COMMON_ROLE_CLASS; private static Class ROLE_STRATEGY_CLASS; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBResourceImpl.java index 50b2ad557..9474fcd8e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EJBResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBResourceImpl.java @@ -12,15 +12,15 @@ * Created on Mar 27, 2003 * */ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EJBResource; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.ejb.EJBJarTranslator; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EjbFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbFactoryImpl.java index 2a1b247c0..94f680805 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EjbFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.List; @@ -55,7 +55,7 @@ import org.eclipse.jst.j2ee.ejb.SessionType; import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind; import org.eclipse.jst.j2ee.ejb.TransactionAttributeType; import org.eclipse.jst.j2ee.ejb.TransactionType; -import org.eclipse.jst.j2ee.ejb.util.CMPKeySynchronizationAdapter; +import org.eclipse.jst.j2ee.internal.ejb.util.CMPKeySynchronizationAdapter; import org.eclipse.wst.common.emf.utilities.AdapterFactoryDescriptor; import org.eclipse.wst.common.emf.utilities.AdapterFactoryUtil; import org.eclipse.wst.common.emf.utilities.ExtendedEcoreUtil; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbPackageImpl.java index 8e9789e1d..ae11f03ac 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EjbPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -21,11 +21,8 @@ import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.AcknowledgeMode; import org.eclipse.jst.j2ee.ejb.ActivationConfig; import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty; @@ -60,20 +57,23 @@ import org.eclipse.jst.j2ee.ejb.SessionType; import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind; import org.eclipse.jst.j2ee.ejb.TransactionAttributeType; import org.eclipse.jst.j2ee.ejb.TransactionType; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; public class EjbPackageImpl extends EPackageImpl implements EjbPackage, EPackage { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EnterpriseBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EnterpriseBeanImpl.java index d493408d3..131133324 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EnterpriseBeanImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EnterpriseBeanImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; @@ -43,7 +43,6 @@ import org.eclipse.jst.j2ee.common.EjbRef; import org.eclipse.jst.j2ee.common.J2EEVersionResource; import org.eclipse.jst.j2ee.common.SecurityIdentity; import org.eclipse.jst.j2ee.common.SecurityRoleRef; -import org.eclipse.jst.j2ee.common.impl.JNDIEnvRefsGroupImpl; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EjbFactory; import org.eclipse.jst.j2ee.ejb.EjbMethodElementComparator; @@ -54,6 +53,7 @@ import org.eclipse.jst.j2ee.ejb.MethodElementKind; import org.eclipse.jst.j2ee.ejb.MethodPermission; import org.eclipse.jst.j2ee.ejb.MethodTransaction; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl; import org.eclipse.wst.common.internal.emf.utilities.Revisit; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EntityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EntityImpl.java index f1ca1490b..098b23618 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/EntityImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EntityImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ExcludeListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ExcludeListImpl.java index e506032b2..c20845428 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ExcludeListImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ExcludeListImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/KeyRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleAttributeFilter.java index dbdff7ea0..11aec60a4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/KeyRelationshipRoleAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/KeyRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleFilter.java index e60f2486c..bd4d6b188 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/KeyRelationshipRoleFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Iterator; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalKeyAttributeFilter.java index 0ce7451ef..53d0f43a8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalKeyAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalKeyAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import org.eclipse.jst.j2ee.ejb.CMPAttribute; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalModelledPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalModelledPersistentAttributeFilter.java index a720bfc75..67e731195 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalModelledPersistentAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalModelledPersistentAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalOppositeRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalOppositeRelationshipRoleFilter.java index 3f133409b..f444bf351 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalOppositeRelationshipRoleFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalOppositeRelationshipRoleFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Iterator; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalPersistentAttributeFilter.java index e71691be0..8bf0340ef 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalPersistentAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalPersistentAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import org.eclipse.jst.j2ee.ejb.CMPAttribute; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleAttributeFilter.java index 28d1c79af..a033f9fba 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalRelationshipRoleAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalRelationshipRoleKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleKeyAttributeFilter.java index 61d0461fb..18a79835a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/LocalRelationshipRoleKeyAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleKeyAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MessageDrivenDestinationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenDestinationImpl.java index 747e21ee9..e15c14432 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MessageDrivenDestinationImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenDestinationImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MessageDrivenImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenImpl.java index 7836ec852..8f6232374 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MessageDrivenImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MethodElementImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodElementImpl.java index 7554bcb5c..6e7b7daae 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MethodElementImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodElementImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; @@ -38,7 +38,7 @@ import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.MethodElement; import org.eclipse.jst.j2ee.ejb.MethodElementKind; import org.eclipse.jst.j2ee.ejb.Session; -import org.eclipse.jst.j2ee.ejb.util.MethodElementHelper; +import org.eclipse.jst.j2ee.internal.ejb.util.MethodElementHelper; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MethodPermissionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodPermissionImpl.java index e6c07c97f..7cf5eb669 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MethodPermissionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodPermissionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MethodTransactionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodTransactionImpl.java index 67dc074e9..41901db26 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/MethodTransactionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodTransactionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ModelledKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledKeyAttributeFilter.java index e55c4145e..9670b4331 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ModelledKeyAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledKeyAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.List; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ModelledPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledPersistentAttributeFilter.java index 1bb683d96..5259acc09 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/ModelledPersistentAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledPersistentAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.List; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/NonKeyRequiredRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/NonKeyRequiredRoleFilter.java index 83a92205f..0c0b3cb32 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/NonKeyRequiredRoleFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/NonKeyRequiredRoleFilter.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Iterator; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/QueryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryImpl.java index 47eb451ca..d0e4947d1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/QueryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/QueryMethodImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryMethodImpl.java index a4606fd09..fc8a4b0bc 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/QueryMethodImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryMethodImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipRoleAttributeFilter.java index 7fda8fc5e..a4ae157b9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RelationshipRoleAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipRoleAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RelationshipsImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipsImpl.java index 6485db257..f37ccb228 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RelationshipsImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipsImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RequiredLocalRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredLocalRelationshipRoleFilter.java index 8cc4114f3..40ca6b645 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RequiredLocalRelationshipRoleFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredLocalRelationshipRoleFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collections; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RequiredRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredRelationshipRoleFilter.java index 6eab1b390..bd83244f8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RequiredRelationshipRoleFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredRelationshipRoleFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Iterator; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleShapeStrategy.java index d91141219..d75398e8b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RoleShapeStrategy.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleShapeStrategy.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RoleSourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleSourceImpl.java index 4abb644b8..02bd8553b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/RoleSourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleSourceImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/SessionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SessionImpl.java index b1c846906..be9841c06 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/SessionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SessionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/SupertypeCMPAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SupertypeCMPAttributeFilter.java index c3b64c2e2..0d3041527 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/impl/SupertypeCMPAttributeFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SupertypeCMPAttributeFilter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.impl; +package org.eclipse.jst.j2ee.internal.ejb.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CMPFieldDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPFieldDescriptor.java index 3913dbf45..a90b372b0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CMPFieldDescriptor.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPFieldDescriptor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; /** * A parameter descriptor is used to describe a method parameter. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CMPHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPHelper.java index 501a4fcc9..b72fbc586 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CMPHelper.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPHelper.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import java.util.ArrayList; import java.util.Collections; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CMPKeySynchronizationAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPKeySynchronizationAdapter.java index a2e3c08b9..99633cfb8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CMPKeySynchronizationAdapter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPKeySynchronizationAdapter.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import java.util.ArrayList; import java.util.List; @@ -35,7 +35,7 @@ import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; import org.eclipse.jst.j2ee.ejb.EjbFactory; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.ContainerManagedEntityImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.ContainerManagedEntityImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CommonRelationshipAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CommonRelationshipAttributeMaintenanceAdapter.java index ead5e5257..1f41b2310 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/CommonRelationshipAttributeMaintenanceAdapter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CommonRelationshipAttributeMaintenanceAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import java.util.List; import org.eclipse.emf.common.notify.Notification; @@ -21,7 +21,7 @@ import org.eclipse.jst.j2ee.ejb.CommonRelationship; import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; public abstract class CommonRelationshipAttributeMaintenanceAdapter extends AdapterImpl { protected static EjbPackage EJB_PACK = EjbFactoryImpl.getPackage(); diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/ConvertedEJBAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/ConvertedEJBAdapter.java index c419cd2b9..28cde94ab 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/ConvertedEJBAdapter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/ConvertedEJBAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import org.eclipse.emf.common.notify.impl.AdapterImpl; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EJBAttributeMaintenanceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBAttributeMaintenanceFactoryImpl.java index 7a8d988e1..65ac195d1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EJBAttributeMaintenanceFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBAttributeMaintenanceFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EJBRelationAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBRelationAttributeMaintenanceAdapter.java index 17f594efc..08117bc93 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EJBRelationAttributeMaintenanceAdapter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBRelationAttributeMaintenanceAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EjbAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbAdapterFactory.java index 5e564284a..86d2bddec 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EjbAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EjbSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbSwitch.java index 282a95221..90c6300d2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/EjbSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/MethodElementHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/MethodElementHelper.java index e7ef7a4a5..d80b520cf 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/MethodElementHelper.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/MethodElementHelper.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.jst.j2ee.ejb.ExcludeList; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/RelationshipsAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/RelationshipsAttributeMaintenanceAdapter.java index abafeeeec..28d9af773 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/util/RelationshipsAttributeMaintenanceAdapter.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/RelationshipsAttributeMaintenanceAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.ejb.util; +package org.eclipse.jst.j2ee.internal.ejb.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jst.j2ee.ejb.EJBRelation; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; public class RelationshipsAttributeMaintenanceAdapter extends AdapterImpl { /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ActivationSpecImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ActivationSpecImpl.java index 88bf9d2ae..5881fa369 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ActivationSpecImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ActivationSpecImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/AdminObjectImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AdminObjectImpl.java index 9c187bbcf..13fa977c6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/AdminObjectImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AdminObjectImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/AuthenticationMechanismImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AuthenticationMechanismImpl.java index 15ca01547..a34d919d1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/AuthenticationMechanismImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AuthenticationMechanismImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConfigPropertyImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConfigPropertyImpl.java index 443f8cbc3..02993bfae 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConfigPropertyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConfigPropertyImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectionDefinitionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectionDefinitionImpl.java index 03c7bb1de..8eee57356 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectionDefinitionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectionDefinitionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorImpl.java index 46eec25ac..c6e8ef062 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectorImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jst.j2ee.common.J2EEVersionResource; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.jca.Connector; import org.eclipse.jst.j2ee.jca.JcaPackage; import org.eclipse.jst.j2ee.jca.License; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectorResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceFactory.java index d1a309ff9..593c2f718 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectorResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceFactory.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.RendererFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectorResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceImpl.java index b0f91220f..71cecaf6c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ConnectorResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceImpl.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.connector.ConnectorTranslator; import org.eclipse.jst.j2ee.jca.Connector; import org.eclipse.jst.j2ee.jca.ConnectorResource; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/InboundResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/InboundResourceAdapterImpl.java index 303f793e3..d7f355c40 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/InboundResourceAdapterImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/InboundResourceAdapterImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/JcaFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaFactoryImpl.java index 76495f7c3..76e854066 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/JcaFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/JcaPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaPackageImpl.java index 94a651efd..2290e474c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/JcaPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -19,13 +19,16 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.ActivationSpec; import org.eclipse.jst.j2ee.jca.AdminObject; import org.eclipse.jst.j2ee.jca.AuthenticationMechanism; @@ -45,17 +48,14 @@ import org.eclipse.jst.j2ee.jca.ResourceAdapter; import org.eclipse.jst.j2ee.jca.SecurityPermission; import org.eclipse.jst.j2ee.jca.TransactionSupportKind; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; public class JcaPackageImpl extends EPackageImpl implements JcaPackage, EPackage { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/LicenseImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/LicenseImpl.java index 43ab399f1..99de87f49 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/LicenseImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/LicenseImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/MessageAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageAdapterImpl.java index fe5d65ff8..1297a9cb1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/MessageAdapterImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageAdapterImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/MessageListenerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageListenerImpl.java index ca8179892..c7cd6ca04 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/MessageListenerImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageListenerImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/OutboundResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/OutboundResourceAdapterImpl.java index 219f287cd..66b0c98b2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/OutboundResourceAdapterImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/OutboundResourceAdapterImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/RequiredConfigPropertyTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/RequiredConfigPropertyTypeImpl.java index 96b7be83b..4f11b29ee 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/RequiredConfigPropertyTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/RequiredConfigPropertyTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ResourceAdapterImpl.java index 4990c3be2..1eb9d66f7 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/ResourceAdapterImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ResourceAdapterImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/SecurityPermissionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/SecurityPermissionImpl.java index d1ce6ae38..4a755b51d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/impl/SecurityPermissionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/SecurityPermissionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.impl; +package org.eclipse.jst.j2ee.internal.jca.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/util/JCADescriptionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JCADescriptionHelper.java index 17c2d305f..1f5eee606 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/util/JCADescriptionHelper.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JCADescriptionHelper.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.util; +package org.eclipse.jst.j2ee.internal.jca.util; import org.eclipse.emf.common.util.EList; import org.eclipse.jst.j2ee.common.CommonFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/util/JcaAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaAdapterFactory.java index 56757a7b0..560c57e9c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/util/JcaAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.util; +package org.eclipse.jst.j2ee.internal.jca.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/util/JcaSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaSwitch.java index c9e699cc7..2756ea01b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/util/JcaSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jca.util; +package org.eclipse.jst.j2ee.internal.jca.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JSPConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPConfigImpl.java index 0e7f76e34..5f6ffb6be 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JSPConfigImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPConfigImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jsp.impl; +package org.eclipse.jst.j2ee.internal.jsp.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JSPPropertyGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPPropertyGroupImpl.java index 0fb32b613..41d2b4d65 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JSPPropertyGroupImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPPropertyGroupImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jsp.impl; +package org.eclipse.jst.j2ee.internal.jsp.impl; import java.util.Collection; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup; import org.eclipse.jst.j2ee.jsp.JspPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JspFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspFactoryImpl.java index 2cb253e9d..f08a98ece 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JspFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jsp.impl; +package org.eclipse.jst.j2ee.internal.jsp.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.impl.EFactoryImpl; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspPackageImpl.java index 22bf9ff62..eb7fb134f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/JspPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jsp.impl; +package org.eclipse.jst.j2ee.internal.jsp.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -18,30 +18,30 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JSPConfig; import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup; import org.eclipse.jst.j2ee.jsp.JspFactory; import org.eclipse.jst.j2ee.jsp.JspPackage; import org.eclipse.jst.j2ee.jsp.TagLibRefType; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/TagLibRefTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/TagLibRefTypeImpl.java index 8b253bf2c..110e0a0c8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/impl/TagLibRefTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/TagLibRefTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jsp.impl; +package org.eclipse.jst.j2ee.internal.jsp.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/util/JspAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspAdapterFactory.java index b25f2e512..42fda23bd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/util/JspAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jsp.util; +package org.eclipse.jst.j2ee.internal.jsp.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/util/JspSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspSwitch.java index 8c3363eb5..17b5f5813 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/util/JspSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.jsp.util; +package org.eclipse.jst.j2ee.internal.jsp.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/Connector14SpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/Connector14SpecificationMigrator.java index 091868a0a..93087a272 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/Connector14SpecificationMigrator.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/Connector14SpecificationMigrator.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.migration; +package org.eclipse.jst.j2ee.internal.migration; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EEMigrationMultiStatus.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationMultiStatus.java index ae44238aa..fef91fbfb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EEMigrationMultiStatus.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationMultiStatus.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.migration; +package org.eclipse.jst.j2ee.internal.migration; /** * @author DABERG diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EEMigrationStatus.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationStatus.java index 6f68ceb07..095edae4f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EEMigrationStatus.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationStatus.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.migration; +package org.eclipse.jst.j2ee.internal.migration; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EESpecificationMigrationConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrationConstants.java index efbdb64c3..e351b55a1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EESpecificationMigrationConstants.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrationConstants.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.migration; +package org.eclipse.jst.j2ee.internal.migration; import org.eclipse.jst.j2ee.internal.MOFJ2EEResourceHandler; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EESpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrator.java index a92e66623..5b94207f0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/J2EESpecificationMigrator.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.migration; +package org.eclipse.jst.j2ee.internal.migration; import java.text.MessageFormat; import java.util.HashMap; @@ -24,7 +24,6 @@ import org.eclipse.jst.j2ee.application.ApplicationResource; import org.eclipse.jst.j2ee.client.ApplicationClientResource; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.ejb.AcknowledgeMode; import org.eclipse.jst.j2ee.ejb.ActivationConfig; import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty; @@ -39,9 +38,10 @@ import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination; import org.eclipse.jst.j2ee.ejb.MethodElement; import org.eclipse.jst.j2ee.ejb.QueryMethod; import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; import org.eclipse.jst.j2ee.jca.ConnectorResource; import org.eclipse.jst.j2ee.webapplication.WebAppResource; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/SpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/SpecificationMigrator.java index 25693ce57..dd31b0225 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/SpecificationMigrator.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/SpecificationMigrator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.migration; +package org.eclipse.jst.j2ee.internal.migration; import org.eclipse.jst.j2ee.application.ApplicationResource; import org.eclipse.jst.j2ee.client.ApplicationClientResource; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/War14SpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/War14SpecificationMigrator.java index 62274ca87..6508da831 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/migration/War14SpecificationMigrator.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/War14SpecificationMigrator.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.migration; +package org.eclipse.jst.j2ee.internal.migration; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/ExtensibleTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ExtensibleTypeImpl.java index 70cb2e94a..24947c59e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/ExtensibleTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ExtensibleTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/FunctionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/FunctionImpl.java index 75bd41c53..955a11068 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/FunctionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/FunctionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jem.java.JavaClass; -import org.eclipse.jst.j2ee.common.impl.DescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl; import org.eclipse.jst.j2ee.taglib.Function; import org.eclipse.jst.j2ee.taglib.TaglibPackage; import org.eclipse.jst.j2ee.taglib.TldExtension; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/JSPTagAttributeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagAttributeImpl.java index d5b98a28f..125402a5b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/JSPTagAttributeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagAttributeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/JSPTagImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagImpl.java index 8c03bb3bc..bb46a3d06 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/JSPTagImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jem.java.JavaClass; -import org.eclipse.jst.j2ee.common.impl.DescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl; import org.eclipse.jst.j2ee.taglib.BodyContentType; import org.eclipse.jst.j2ee.taglib.JSPTag; import org.eclipse.jst.j2ee.taglib.JSPTagAttribute; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/JSPVariableImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPVariableImpl.java index deac6f68c..94d4ffacb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/JSPVariableImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPVariableImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TagFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagFileImpl.java index 616b1323f..30e72fc87 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TagFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagFileImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.j2ee.common.impl.DescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl; import org.eclipse.jst.j2ee.taglib.TagFile; import org.eclipse.jst.j2ee.taglib.TaglibPackage; import org.eclipse.jst.j2ee.taglib.TldExtension; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TagLibImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagLibImpl.java index be51420e3..5c80cf652 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TagLibImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagLibImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jst.j2ee.common.J2EEVersionResource; import org.eclipse.jst.j2ee.common.Listener; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.taglib.Function; import org.eclipse.jst.j2ee.taglib.JSPTag; import org.eclipse.jst.j2ee.taglib.TagLib; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TaglibFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibFactoryImpl.java index f9f364228..3e5b3bcdf 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TaglibFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TaglibPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibPackageImpl.java index 97e1e66c8..9c941e597 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TaglibPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import org.eclipse.emf.ecore.EAttribute; @@ -21,17 +21,18 @@ import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.BodyContentType; import org.eclipse.jst.j2ee.taglib.ExtensibleType; import org.eclipse.jst.j2ee.taglib.Function; @@ -46,13 +47,12 @@ import org.eclipse.jst.j2ee.taglib.TaglibPackage; import org.eclipse.jst.j2ee.taglib.TldExtension; import org.eclipse.jst.j2ee.taglib.Validator; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; public class TaglibPackageImpl extends EPackageImpl implements TaglibPackage, EPackage { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TldExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TldExtensionImpl.java index bf15c17e3..6078e6598 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/TldExtensionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TldExtensionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/ValidatorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ValidatorImpl.java index 2fa3e0a47..74d4ec438 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/impl/ValidatorImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ValidatorImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.impl; +package org.eclipse.jst.j2ee.internal.taglib.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/util/TaglibAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibAdapterFactory.java index d53aa9845..8eca8856e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/util/TaglibAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.util; +package org.eclipse.jst.j2ee.internal.taglib.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/util/TaglibSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibSwitch.java index 7645cbf8f..66ac95e4a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/util/TaglibSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibSwitch.java @@ -8,12 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.taglib.util; +package org.eclipse.jst.j2ee.internal.taglib.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup; import org.eclipse.jst.j2ee.common.DescriptionGroup; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibFactoryImpl; import org.eclipse.jst.j2ee.taglib.ExtensibleType; import org.eclipse.jst.j2ee.taglib.Function; import org.eclipse.jst.j2ee.taglib.JSPTag; @@ -25,7 +26,6 @@ import org.eclipse.jst.j2ee.taglib.TaglibFactory; import org.eclipse.jst.j2ee.taglib.TaglibPackage; import org.eclipse.jst.j2ee.taglib.TldExtension; import org.eclipse.jst.j2ee.taglib.Validator; -import org.eclipse.jst.j2ee.taglib.impl.TaglibFactoryImpl; public class TaglibSwitch { /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/AuthConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/AuthConstraintImpl.java index 444c7ec96..a4fe4f07f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/AuthConstraintImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/AuthConstraintImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ContextParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ContextParamImpl.java index c789f54d6..f25460440 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ContextParamImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ContextParamImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ErrorCodeErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorCodeErrorPageImpl.java index 5a769c5d4..c3219f0cc 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ErrorCodeErrorPageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorCodeErrorPageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorPageImpl.java index 5ce81317d..f6dc339b1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ErrorPageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorPageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ExceptionTypeErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ExceptionTypeErrorPageImpl.java index c939324de..ed53adb25 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ExceptionTypeErrorPageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ExceptionTypeErrorPageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/FilterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterImpl.java index 92829d984..9c6eb932c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/FilterImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.j2ee.common.ParamValue; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.webapplication.Filter; import org.eclipse.jst.j2ee.webapplication.InitParam; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/FilterMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterMappingImpl.java index 670752845..052a20df7 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/FilterMappingImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterMappingImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/FormLoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FormLoginConfigImpl.java index 1fd10b362..3f5198f0e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/FormLoginConfigImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FormLoginConfigImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/HTTPMethodTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/HTTPMethodTypeImpl.java index 18f31e8fc..abee6418f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/HTTPMethodTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/HTTPMethodTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/InitParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/InitParamImpl.java index e29d9160a..fbdc250b5 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/InitParamImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/InitParamImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/JSPTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/JSPTypeImpl.java index f23c5ece9..535fb478d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/JSPTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/JSPTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/LocalEncodingMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingImpl.java index be53a1e8d..7a8a35da0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/LocalEncodingMappingImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/LocalEncodingMappingListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingListImpl.java index 21bfea22d..16483b4bb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/LocalEncodingMappingListImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingListImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/LoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LoginConfigImpl.java index fa646e16c..78b760893 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/LoginConfigImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LoginConfigImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/MimeMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/MimeMappingImpl.java index c73b865a6..4d1cb5e52 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/MimeMappingImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/MimeMappingImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/RoleNameTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/RoleNameTypeImpl.java index c343346c6..de6b1237d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/RoleNameTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/RoleNameTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/SecurityConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SecurityConstraintImpl.java index 693177469..c85189130 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/SecurityConstraintImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SecurityConstraintImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ServletImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletImpl.java index 50601e54b..16645475b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ServletImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; import java.util.Iterator; @@ -33,7 +33,7 @@ import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.j2ee.common.ParamValue; import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity; import org.eclipse.jst.j2ee.common.SecurityRoleRef; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.webapplication.InitParam; import org.eclipse.jst.j2ee.webapplication.JSPType; import org.eclipse.jst.j2ee.webapplication.Servlet; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ServletMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletMappingImpl.java index d92a2a580..e3ca38b8a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ServletMappingImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletMappingImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ServletTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletTypeImpl.java index 7d1d9db35..d43708bc9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/ServletTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/SessionConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SessionConfigImpl.java index 44309c084..71bbc9eeb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/SessionConfigImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SessionConfigImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/TagLibRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/TagLibRefImpl.java index b1386e0a3..41251c0f0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/TagLibRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/TagLibRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/URLPatternTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/URLPatternTypeImpl.java index 3261ef1fe..bcc7dcd5e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/URLPatternTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/URLPatternTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/UserDataConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/UserDataConstraintImpl.java index 988939d44..14ad46827 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/UserDataConstraintImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/UserDataConstraintImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebAppImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppImpl.java index 986ce4b5d..666cc0de8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebAppImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.ArrayList; import java.util.Collection; @@ -31,10 +31,10 @@ import org.eclipse.jst.j2ee.common.MessageDestination; import org.eclipse.jst.j2ee.common.ParamValue; import org.eclipse.jst.j2ee.common.SecurityRole; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.JNDIEnvRefsGroupImpl; -import org.eclipse.jst.j2ee.common.util.CommonUtil; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; import org.eclipse.jst.j2ee.jsp.JSPConfig; import org.eclipse.jst.j2ee.webapplication.ContextParam; import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebAppResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceFactory.java index 7c36932e8..7a82d1b56 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebAppResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceFactory.java @@ -14,12 +14,12 @@ * To change this generated comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry; import org.eclipse.wst.common.internal.emf.resource.Renderer; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebAppResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceImpl.java index 8da37f96d..280197008 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebAppResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceImpl.java @@ -14,12 +14,12 @@ * To change this generated comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.webapplication.WebAppTranslator; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webapplication.WebAppResource; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebResourceCollectionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebResourceCollectionImpl.java index d3f971531..30fb86a8f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebResourceCollectionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebResourceCollectionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebTypeImpl.java index 79bd11fe6..8862ead59 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.EObjectImpl; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebapplicationFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationFactoryImpl.java index d6c7ba51b..82f4460d9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebapplicationFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebapplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationPackageImpl.java index 80ac41ce0..6e27cde8b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WebapplicationPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -20,19 +20,19 @@ import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.AuthConstraint; import org.eclipse.jst.j2ee.webapplication.AuthMethodKind; import org.eclipse.jst.j2ee.webapplication.ContextParam; @@ -69,12 +69,12 @@ import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; import org.eclipse.jst.j2ee.webapplication.WelcomeFile; import org.eclipse.jst.j2ee.webapplication.WelcomeFileList; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; public class WebapplicationPackageImpl extends EPackageImpl implements WebapplicationPackage, EPackage { diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WelcomeFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileImpl.java index 6b913efc6..42c8bd8ce 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WelcomeFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WelcomeFileListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileListImpl.java index 82c1c3690..154489587 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/impl/WelcomeFileListImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileListImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.impl; +package org.eclipse.jst.j2ee.internal.webapplication.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/util/WebapplicationAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationAdapterFactory.java index eef760728..a20326ea5 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/util/WebapplicationAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.util; +package org.eclipse.jst.j2ee.internal.webapplication.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/util/WebapplicationSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationSwitch.java index c95cbfc13..ce362a022 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/util/WebapplicationSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webapplication.util; +package org.eclipse.jst.j2ee.internal.webapplication.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/util/DescriptionGroupHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupHelper.java index b22f5e732..7814467ca 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/util/DescriptionGroupHelper.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupHelper.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.util; +package org.eclipse.jst.j2ee.internal.webservice.util; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/util/DescriptionGroupItem.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupItem.java index 85b2236f0..99e66466c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/util/DescriptionGroupItem.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupItem.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.util; +package org.eclipse.jst.j2ee.internal.webservice.util; import java.util.Arrays; import java.util.Collections; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/util/QNameHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/QNameHelper.java index 526e5ab6b..06053c4ab 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/util/QNameHelper.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/QNameHelper.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.util; +package org.eclipse.jst.j2ee.internal.webservice.util; import org.eclipse.jst.j2ee.common.J2EEVersionResource; import org.eclipse.jst.j2ee.common.QName; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java index 54f4c406a..e2132bdb8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java @@ -22,7 +22,7 @@ public interface JcaFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - JcaFactory eINSTANCE = new org.eclipse.jst.j2ee.jca.impl.JcaFactoryImpl(); + JcaFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.jca.impl.JcaFactoryImpl(); /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaPackage.java index 5b94dbc77..9fe8bbfb6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaPackage.java @@ -265,7 +265,7 @@ public interface JcaPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - JcaPackage eINSTANCE = org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl.init(); + JcaPackage eINSTANCE = org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl.init(); /** * @generated This field/method will be replaced during code generation. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java index ed50d0a71..af17586f5 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java @@ -27,7 +27,7 @@ public interface JspFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - JspFactory eINSTANCE = new org.eclipse.jst.j2ee.jsp.impl.JspFactoryImpl(); + JspFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.jsp.impl.JspFactoryImpl(); /** * Returns a new object of class '<em>JSP Config</em>'. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspPackage.java index a1fcce4de..be214cb7b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspPackage.java @@ -62,7 +62,7 @@ public interface JspPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - JspPackage eINSTANCE = org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl.init(); + JspPackage eINSTANCE = org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl.init(); /** * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPConfigImpl <em>JSP Config</em>}' class. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibFactory.java index 3a094a4b2..ba87cce25 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibFactory.java @@ -21,7 +21,7 @@ public interface TaglibFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - TaglibFactory eINSTANCE = new org.eclipse.jst.j2ee.taglib.impl.TaglibFactoryImpl(); + TaglibFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.taglib.impl.TaglibFactoryImpl(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibPackage.java index e763ccf39..b63fcd2a7 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibPackage.java @@ -606,7 +606,7 @@ public interface TaglibPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - TaglibPackage eINSTANCE = org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl.init(); + TaglibPackage eINSTANCE = org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl.init(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java index 2339a56c2..d8ec6397c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java @@ -21,7 +21,7 @@ public interface WebapplicationFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - WebapplicationFactory eINSTANCE = new org.eclipse.jst.j2ee.webapplication.impl.WebapplicationFactoryImpl(); + WebapplicationFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationFactoryImpl(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationPackage.java index 03d938559..41f9468df 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationPackage.java @@ -1219,7 +1219,7 @@ public interface WebapplicationPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - WebapplicationPackage eINSTANCE = org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl.init(); + WebapplicationPackage eINSTANCE = org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl.init(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/ComponentScopedRefsImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ComponentScopedRefsImpl.java index 4cdb5fe0f..513b44170 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/ComponentScopedRefsImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ComponentScopedRefsImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/HandlerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/HandlerImpl.java index a818e1d38..5be602f3b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/HandlerImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/HandlerImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import java.util.Collection; @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.j2ee.common.ParamValue; import org.eclipse.jst.j2ee.common.QName; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/PortComponentRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/PortComponentRefImpl.java index f7ed15526..23fae9804 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/PortComponentRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/PortComponentRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/ServiceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ServiceRefImpl.java index 7319c5f6f..bdd59da5d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/ServiceRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ServiceRefImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import java.util.Collection; @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.j2ee.common.QName; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/WebServicesClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientImpl.java index 875be9cd7..429e3fb58 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/WebServicesClientImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/WebServicesClientResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientResourceFactory.java index 01a4de98a..4076e5c0b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/WebServicesClientResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientResourceFactory.java @@ -14,12 +14,12 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.RendererFactory; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/WebServicesResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesResourceImpl.java index e9be27be3..6edcb8319 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/WebServicesResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesResourceImpl.java @@ -14,13 +14,13 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.webservices.WebServicesTranslator; import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient; import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/Webservice_clientFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientFactoryImpl.java index 4e588db12..b4c89c2fa 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/Webservice_clientFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/Webservice_clientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientPackageImpl.java index 1f8bdffc7..709a5fe27 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/impl/Webservice_clientPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -19,21 +19,23 @@ import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef; @@ -42,9 +44,7 @@ import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/util/Webservice_clientAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientAdapterFactory.java index 100eebb7d..dd2b85547 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/util/Webservice_clientAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.util; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/util/Webservice_clientSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientSwitch.java index 225ec972f..5ee385a3f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/util/Webservice_clientSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsclient.util; +package org.eclipse.jst.j2ee.webservice.internal.wsclient.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/DescriptionTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DescriptionTypeImpl.java index 653b2967c..22c2cf773 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/DescriptionTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DescriptionTypeImpl.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.DescriptionImpl; +import org.eclipse.jst.j2ee.internal.common.impl.DescriptionImpl; import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/DisplayNameTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DisplayNameTypeImpl.java index 0aec0517e..fc6133af3 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/DisplayNameTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DisplayNameTypeImpl.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.DisplayNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.DisplayNameImpl; import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/InitParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/InitParamImpl.java index f5d09f1bc..89186b683 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/InitParamImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/InitParamImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/PortNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/PortNameImpl.java index d3dc769bb..04f0fe5b1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/PortNameImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/PortNameImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/SOAPHeaderImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPHeaderImpl.java index d484a5d9b..80edef888 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/SOAPHeaderImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPHeaderImpl.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.QNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl; import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/SOAPRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPRoleImpl.java index 0ec31fb6b..1259fd210 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/SOAPRoleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPRoleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/WscommonFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonFactoryImpl.java index e5f1603f8..bfdc7a2df 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/WscommonFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/WscommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonPackageImpl.java index fd59d3b94..357f83b59 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/impl/WscommonPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.impl; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -18,23 +18,24 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType; import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType; import org.eclipse.jst.j2ee.webservice.wscommon.InitParam; @@ -44,7 +45,6 @@ import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/util/WscommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonAdapterFactory.java index 4e3c7cd82..aa209d139 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/util/WscommonAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.util; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/util/WscommonSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonSwitch.java index 9c76175e6..21b867277 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/util/WscommonSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wscommon.util; +package org.eclipse.jst.j2ee.webservice.internal.wscommon.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/BeanLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/BeanLinkImpl.java index fc0695896..6446efcaa 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/BeanLinkImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/BeanLinkImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.EObjectImpl; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/EJBLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/EJBLinkImpl.java index 08c461f45..9e13a2085 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/EJBLinkImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/EJBLinkImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/HandlerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/HandlerImpl.java index 11a9457ed..7176ea397 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/HandlerImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/HandlerImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import java.util.Collection; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.webservice.wscommon.InitParam; import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader; import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/PortComponentImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/PortComponentImpl.java index 1759fa5b2..caa3efe34 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/PortComponentImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/PortComponentImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/ServiceImplBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServiceImplBeanImpl.java index b8c68b5db..3c4a124bd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/ServiceImplBeanImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServiceImplBeanImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/ServletLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServletLinkImpl.java index 4c9b9a0ad..78b35ab56 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/ServletLinkImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServletLinkImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WSDLPortImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WSDLPortImpl.java index b9b767b76..1cfc3f239 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WSDLPortImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WSDLPortImpl.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.QNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WebServiceDescriptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServiceDescriptionImpl.java index d7a025d96..c6724ba87 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WebServiceDescriptionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServiceDescriptionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import java.util.Collection; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WebServicesImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServicesImpl.java index d2600d91e..dfaedf9bb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WebServicesImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServicesImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import java.util.Collection; @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.j2ee.common.impl.CompatibilityDescriptionGroupImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription; import org.eclipse.jst.j2ee.webservice.wsdd.WebServices; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WsddFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddFactoryImpl.java index cede755cd..296f7e359 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WsddFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WsddPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddPackageImpl.java index ff0c5f63d..25a72643f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WsddPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -18,25 +18,25 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; import org.eclipse.jst.j2ee.client.ClientPackage; -import org.eclipse.jst.j2ee.client.impl.ClientPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaPackageImpl; import org.eclipse.jst.j2ee.jsp.JspPackage; -import org.eclipse.jst.j2ee.jsp.impl.JspPackageImpl; import org.eclipse.jst.j2ee.taglib.TaglibPackage; -import org.eclipse.jst.j2ee.taglib.impl.TaglibPackageImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; -import org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink; import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink; import org.eclipse.jst.j2ee.webservice.wsdd.Handler; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WsddResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddResourceImpl.java index d5e623f40..9b5937549 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/impl/WsddResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddResourceImpl.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.impl; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.webservices.WsddTranslator; import org.eclipse.jst.j2ee.webservice.WebServiceConstants; import org.eclipse.jst.j2ee.webservice.wsdd.WebServices; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/util/WsddAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddAdapterFactory.java index bc6227592..fd0fda837 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/util/WsddAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.util; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/util/WsddSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddSwitch.java index e8d021f82..7c699e251 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/util/WsddSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddSwitch.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.webservice.wsdd.util; +package org.eclipse.jst.j2ee.webservice.internal.wsdd.util; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java index c3f82600e..2773a34f4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java @@ -27,7 +27,7 @@ public interface Webservice_clientFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - Webservice_clientFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientFactoryImpl(); + Webservice_clientFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientFactoryImpl(); /** * Returns a new object of class '<em>Service Ref</em>'. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientPackage.java index e12a048ec..945381d06 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientPackage.java @@ -62,7 +62,7 @@ public interface Webservice_clientPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - Webservice_clientPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.wsclient.impl.Webservice_clientPackageImpl.init(); + Webservice_clientPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl.init(); /** * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl <em>Service Ref</em>}' class. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java index 85ef40044..cd8520cb9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java @@ -27,7 +27,7 @@ public interface WscommonFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - WscommonFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonFactoryImpl(); + WscommonFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonFactoryImpl(); /** * Returns a new object of class '<em>Init Param</em>'. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonPackage.java index 076bb4c74..340c31ba9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonPackage.java @@ -62,7 +62,7 @@ public interface WscommonPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - WscommonPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl.init(); + WscommonPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl.init(); /** * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.InitParamImpl <em>Init Param</em>}' class. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java index 8de697037..273126b9e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java @@ -27,7 +27,7 @@ public interface WsddFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - WsddFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddFactoryImpl(); + WsddFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddFactoryImpl(); /** * Returns a new object of class '<em>Web Services</em>'. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java index b6dd52d88..73f51fd4f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddPackage.java @@ -62,7 +62,7 @@ public interface WsddPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - WsddPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl.init(); + WsddPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl.init(); /** * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServicesImpl <em>Web Services</em>}' class. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResourceFactory.java index f57d8c743..53281f526 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResourceFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResourceFactory.java @@ -12,10 +12,10 @@ package org.eclipse.jst.j2ee.webservice.wsdd; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.jst.j2ee.webservice.WebServiceConstants; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddResourceImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddResourceImpl; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.RendererFactory; import org.eclipse.wst.common.internal.emf.resource.TranslatorResource; diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapPackageImpl.java index 94c2e2901..10a192cbd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapPackageImpl.java @@ -16,7 +16,9 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ClassType; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName; @@ -54,9 +56,7 @@ import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.XMLElementName; import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage; -import org.eclipse.jst.j2ee.webservice.wscommon.impl.WscommonPackageImpl; import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage; -import org.eclipse.jst.j2ee.webservice.wsdd.impl.WsddPackageImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapResourceImpl.java index bf0555c51..bc3f53ee1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/JaxrpcmapResourceImpl.java @@ -12,8 +12,8 @@ package org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl; import org.eclipse.jst.j2ee.internal.model.translator.webservices.JaxrpcmapTranslator; import org.eclipse.jst.j2ee.webservice.WebServiceConstants; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping; diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/RootTypeQnameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/RootTypeQnameImpl.java index 5731dcce1..c60a76f8e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/RootTypeQnameImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/RootTypeQnameImpl.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.QNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname; diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLBindingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLBindingImpl.java index 1a119481b..9548e7c58 100644 --- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLBindingImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLBindingImpl.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.QNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding; diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLMessageImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLMessageImpl.java index c4f1a07f7..a923d0de3 100644 --- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLMessageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLMessageImpl.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.QNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage; diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLPortTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLPortTypeImpl.java index 3f144d3d8..126c2056e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLPortTypeImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLPortTypeImpl.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.QNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType; diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLServiceNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLServiceNameImpl.java index 393975daf..76b940aa4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLServiceNameImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/impl/WSDLServiceNameImpl.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.j2ee.common.impl.QNameImpl; +import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage; import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName; diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml index fe6c88b8c..7dd9f303d 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml @@ -161,13 +161,13 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> </or> </enablement> @@ -203,19 +203,19 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.jca.impl.ConnectorImpl"> + name="org.eclipse.jst.j2ee.internal.jca.impl.ConnectorImpl"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.jca.impl.ResourceAdapterImpl"> + name="org.eclipse.jst.j2ee.internal.jca.impl.ResourceAdapterImpl"> </objectClass> @@ -245,10 +245,10 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.jca.impl.ConnectorImpl"> + name="org.eclipse.jst.j2ee.internal.jca.impl.ConnectorImpl"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.jca.impl.ResourceAdapterImpl"> + name="org.eclipse.jst.j2ee.internal.jca.impl.ResourceAdapterImpl"> </objectClass> </or> </enablement> @@ -260,10 +260,10 @@ <enablement> <or> <objectClass - name="org.eclipse.jst.j2ee.jca.impl.ConnectorImpl"> + name="org.eclipse.jst.j2ee.internal.jca.impl.ConnectorImpl"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.jca.impl.ResourceAdapterImpl"> + name="org.eclipse.jst.j2ee.internal.jca.impl.ResourceAdapterImpl"> </objectClass> </or> </enablement> diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java index 6c86a35c5..1dc4aa2f1 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java @@ -19,9 +19,9 @@ import java.text.MessageFormat; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.Plugin; +import org.eclipse.jst.j2ee.internal.jca.impl.JcaFactoryImpl; import org.eclipse.jst.j2ee.jca.JcaFactory; import org.eclipse.jst.j2ee.jca.JcaPackage; -import org.eclipse.jst.j2ee.jca.impl.JcaFactoryImpl; /** diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java index 3c66fe13b..b014c3eb9 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java @@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.j2ee.jca.util.JcaAdapterFactory; +import org.eclipse.jst.j2ee.internal.jca.util.JcaAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java index f667c7247..0733b000e 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java @@ -17,7 +17,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jst.j2ee.common.util.CommonUtil; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; import org.eclipse.swt.graphics.Image; import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory; import org.eclipse.wst.common.navigator.views.ICommonLabelProvider; diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java index c158985a1..47cce5697 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java @@ -12,8 +12,8 @@ package org.eclipse.jst.j2ee.navigator.internal; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.jst.j2ee.common.util.CommonUtil; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; public class J2EEViewerSorter extends ViewerSorter { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java index eb20bd987..fa2242bae 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java @@ -34,7 +34,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.applicationclient.creation.ApplicationClientNatureRuntime; -import org.eclipse.jst.j2ee.common.util.CommonUtil; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; import org.eclipse.jst.j2ee.internal.delete.DeleteModuleOperation; import org.eclipse.jst.j2ee.internal.delete.DeleteOptions; import org.eclipse.jst.j2ee.internal.dialogs.DeleteEARDialog; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java index 7f9198ce0..3809cb3cc 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java @@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.applicationclient.creation.ApplicationClientNatureRuntime; -import org.eclipse.jst.j2ee.common.util.CommonUtil; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameDialog; import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameUIConstants; import org.eclipse.jst.j2ee.internal.dialogs.RenameModuleDialog; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java index 762b9477e..85c97e5f5 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java @@ -17,7 +17,7 @@ import org.eclipse.emf.common.command.StrictCompoundCommand; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.command.PasteFromClipboardCommand; -import org.eclipse.jst.j2ee.common.util.IDUtility; +import org.eclipse.jst.j2ee.internal.common.util.IDUtility; import org.eclipse.jst.j2ee.internal.provider.J2EEUIEditingDomain; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java index 0588dc288..c95056b67 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java @@ -27,7 +27,7 @@ import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.EjbMethodElementComparator; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.MethodElement; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.wst.common.frameworks.internal.ui.DisplayUtility; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java index eff5c569f..7f0d86917 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java @@ -22,7 +22,7 @@ import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.ExcludeList; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; public class ExcludeListContentProvider extends AbstractMethodsContentProvider { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java index 9c79b624e..042a4332e 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java @@ -20,7 +20,7 @@ import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.MethodPermission; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; public class MethodPermissionsContentProvider extends AbstractMethodsContentProvider { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java index 90f2a7a6a..37510ae23 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java @@ -19,7 +19,7 @@ import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.MethodTransaction; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; public class MethodTransactionContentProvider extends AbstractMethodsContentProvider { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java index 4c17d25bf..7e507cc5a 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java @@ -12,8 +12,8 @@ package org.eclipse.jst.j2ee.internal.plugin; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.jst.j2ee.common.util.CommonUtil; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; public class J2EEViewerSorter extends ViewerSorter { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java index a5fc42c3d..bb9a51f72 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java @@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.jst.j2ee.common.CommonPackage; -import org.eclipse.jst.j2ee.common.util.CommonUtil; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.common.util.CommonUtil; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider; import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java index 61203d1f3..9df5e6094 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java @@ -24,7 +24,7 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationFactoryImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationFactoryImpl; import org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProvider; import org.eclipse.jst.j2ee.internal.earcreation.EAREditModel; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java index 4fae98d60..3682b6962 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java @@ -16,7 +16,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jst.j2ee.ejb.ExcludeList; import org.eclipse.jst.j2ee.ejb.MethodPermission; import org.eclipse.jst.j2ee.ejb.MethodTransaction; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider; import org.eclipse.jst.j2ee.internal.ejb.provider.ExcludeListContentProvider; import org.eclipse.jst.j2ee.internal.ejb.provider.MethodPermissionsContentProvider; diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml index 405c3a22c..08b57e379 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml @@ -714,13 +714,13 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> </or> @@ -776,16 +776,16 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.client.impl.ApplicationClientImpl"> + name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> </or> </enablement> @@ -808,13 +808,13 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> </or> </enablement> @@ -842,13 +842,13 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> </or> </enablement> @@ -876,7 +876,7 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.client.impl.ApplicationClientImpl"> + name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl"> </objectClass> </or> </enablement> @@ -911,7 +911,7 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.client.impl.ApplicationClientImpl"> + name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl"> </objectClass> </or> </enablement> diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveFilterOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveFilterOperation.java index 544f1b995..68c411fbe 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveFilterOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveFilterOperation.java @@ -24,11 +24,11 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jem.java.JavaClass; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationFactoryImpl; import org.eclipse.jst.j2ee.webapplication.Filter; import org.eclipse.jst.j2ee.webapplication.FilterMapping; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationFactoryImpl; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; import org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperation; diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveServletOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveServletOperation.java index 71aac7410..86d7a775c 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveServletOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/RemoveServletOperation.java @@ -25,12 +25,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationFactoryImpl; import org.eclipse.jst.j2ee.webapplication.FilterMapping; import org.eclipse.jst.j2ee.webapplication.Servlet; import org.eclipse.jst.j2ee.webapplication.ServletMapping; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.webapplication.impl.WebapplicationFactoryImpl; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; import org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperation; diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java index d37e908cc..d92f27820 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java @@ -39,8 +39,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler; import org.eclipse.jst.j2ee.internal.web.operations.WebContentResourceChangeListener; import org.eclipse.jst.j2ee.internal.web.taglib.TaglibRegistryManager; import org.eclipse.jst.j2ee.internal.web.util.WebEditAdapterFactory; +import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory; import org.eclipse.jst.j2ee.web.taglib.ITaglibRegistryManager; -import org.eclipse.jst.j2ee.webapplication.impl.WebAppResourceFactory; import org.eclipse.wst.common.frameworks.internal.WTPPlugin; import org.eclipse.wst.common.modulecore.ArtifactEditModel; import org.eclipse.wst.common.modulecore.internal.builder.DeployableModuleBuilderFactoryRegistry; diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java index e5fbb40a4..a32048f30 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java @@ -26,7 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.j2ee.jsp.util.JspAdapterFactory; +import org.eclipse.jst.j2ee.internal.jsp.util.JspAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java index e4c23f9ce..eac67b72e 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java @@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.jst.j2ee.common.internal.provider.ListenerItemProvider; -import org.eclipse.jst.j2ee.webapplication.util.WebapplicationAdapterFactory; +import org.eclipse.jst.j2ee.internal.webapplication.util.WebapplicationAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java index d30ea7ac2..21e672e3d 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java @@ -25,7 +25,7 @@ import org.eclipse.jst.j2ee.common.QName; import org.eclipse.jst.j2ee.internal.webservice.command.CommandAddElement; import org.eclipse.jst.j2ee.internal.webservice.command.CommandRemoveElement; import org.eclipse.jst.j2ee.internal.webservice.editmodel.EditModel; -import org.eclipse.jst.j2ee.webservice.util.QNameHelper; +import org.eclipse.jst.j2ee.internal.webservice.util.QNameHelper; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Text; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java index 566374fa5..b83c7095f 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java @@ -16,7 +16,7 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.QName; -import org.eclipse.jst.j2ee.webservice.util.QNameHelper; +import org.eclipse.jst.j2ee.internal.webservice.util.QNameHelper; public class CommandModifyNSURI extends AbstractCommand { private QName eObject_; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java index d656c2a04..b370fb250 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.internal.webservice.constants; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin; -import org.eclipse.jst.j2ee.webservice.util.QNameHelper; +import org.eclipse.jst.j2ee.internal.webservice.util.QNameHelper; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java index 1049d981d..b350e24ac 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java @@ -18,7 +18,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext; import com.ibm.wtp.emf.workbench.EMFWorkbenchContextBase; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java index 7b56f77f1..dbcf3902a 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java @@ -26,7 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.j2ee.webservice.wsclient.util.Webservice_clientAdapterFactory; +import org.eclipse.jst.j2ee.webservice.internal.wsclient.util.Webservice_clientAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java index ef50ec6e9..1bfece180 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java @@ -27,7 +27,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.j2ee.webservice.wscommon.util.WscommonAdapterFactory; +import org.eclipse.jst.j2ee.webservice.internal.wscommon.util.WscommonAdapterFactory; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java index 44f975861..a5f50a20a 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java @@ -27,7 +27,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.jst.j2ee.internal.wsdd.provider.HandlerItemProvider; -import org.eclipse.jst.j2ee.webservice.wsdd.util.WsddAdapterFactory; +import org.eclipse.jst.j2ee.webservice.internal.wsdd.util.WsddAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java index a612b4229..e824196b8 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java @@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.j2ee.application.util.ApplicationAdapterFactory; +import org.eclipse.jst.j2ee.internal.application.util.ApplicationAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java index 3aa5487a4..6d049077c 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java @@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.j2ee.client.util.ClientAdapterFactory; +import org.eclipse.jst.j2ee.internal.client.util.ClientAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategyImpl.java index 92f8e0973..ad1495d16 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategyImpl.java @@ -25,7 +25,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource.Factory.Registry; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; @@ -35,6 +34,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureExce import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategyImpl; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.earcreation.EAREditModel; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java index 29764a467..787cc22e3 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java @@ -30,12 +30,12 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.emf.ecore.resource.Resource.Factory.Registry; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.File; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategyImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import com.ibm.wtp.emf.workbench.ProjectUtilities; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java index 05613323d..365deece4 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java @@ -33,7 +33,7 @@ import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EjbPackage; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; import com.ibm.wtp.emf.workbench.ProjectUtilities; import com.ibm.wtp.emf.workbench.nature.EMFNature; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java index 957c8cc09..4ba500817 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/J2EEModifierHelperCreator.java @@ -23,7 +23,7 @@ import org.eclipse.jst.j2ee.ejb.EjbPackage; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.MethodElement; import org.eclipse.jst.j2ee.ejb.MethodPermission; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; import org.eclipse.wst.common.emf.utilities.EtoolsCopyUtility; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleOperation.java index 4720c64a7..58a86671e 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleOperation.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleOperation.java @@ -27,7 +27,7 @@ import org.eclipse.jst.j2ee.common.SecurityRole; import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.MethodPermission; -import org.eclipse.jst.j2ee.ejb.impl.EjbFactoryImpl; +import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; import org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperation; diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java index 4b9eed932..9636208b3 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java @@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.j2ee.common.util.CommonAdapterFactory; +import org.eclipse.jst.j2ee.internal.common.util.CommonAdapterFactory; /** diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectToEAROperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectToEAROperation.java index c390901ff..e67cf9d09 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectToEAROperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectToEAROperation.java @@ -35,7 +35,7 @@ import org.eclipse.emf.common.command.CompoundCommand; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.ApplicationResource; import org.eclipse.jst.j2ee.application.Module; -import org.eclipse.jst.j2ee.application.impl.ApplicationResourceImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceImpl; import org.eclipse.jst.j2ee.internal.archive.operations.EJBArchiveOpsResourceHandler; import org.eclipse.jst.j2ee.internal.earcreation.AddModuleToEARProjectCommand; import org.eclipse.jst.j2ee.internal.earcreation.AddUtilityJARMapCommand; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java index e1f8e42e3..e21f537aa 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/modulemap/ModulemapPackageImpl.java @@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; import org.eclipse.jem.java.impl.JavaRefPackageImpl; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationPackageImpl; -import org.eclipse.jst.j2ee.common.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleWorkbenchURIConverterImpl.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleWorkbenchURIConverterImpl.java index 241abf461..00be6f0c7 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleWorkbenchURIConverterImpl.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleWorkbenchURIConverterImpl.java @@ -34,14 +34,14 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.URIConverterImpl; import org.eclipse.jst.j2ee.applicationclient.creation.ApplicationClientNatureRuntime; -import org.eclipse.jst.j2ee.common.impl.J2EEResouceFactorySaxRegistry; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveTypeDiscriminator; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.AppClient12ImportStrategyImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.EjbJar11ImportStrategyImpl; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResouceFactorySaxRegistry; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import com.ibm.wtp.emf.workbench.ProjectResourceSet; import com.ibm.wtp.emf.workbench.ProjectUtilities; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EENature.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EENature.java index 5721a047c..7ae25471a 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EENature.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EENature.java @@ -20,12 +20,12 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants; import org.eclipse.jst.j2ee.internal.J2EEEditModel; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java index a3d815bb0..d96e96a1d 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.ecore.EObject; import org.eclipse.jst.j2ee.application.operations.AddUtilityProjectToEARDataModel; -import org.eclipse.jst.j2ee.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.Description; @@ -34,6 +33,7 @@ import org.eclipse.jst.j2ee.common.EjbRefType; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyDataModel; import org.eclipse.jst.j2ee.internal.common.operations.JARDependencyOperation; import org.eclipse.jst.j2ee.internal.earcreation.AddUtilityJARMapCommand; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java index 02619e578..8100def4d 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java @@ -12,11 +12,11 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EObject; import org.eclipse.jst.j2ee.application.Module; -import org.eclipse.jst.j2ee.application.impl.ApplicationImpl; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; import org.eclipse.jst.j2ee.client.ApplicationClient; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceCreationOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceCreationOperation.java index e1d8b738d..11f83c568 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceCreationOperation.java @@ -16,7 +16,6 @@ package org.eclipse.jst.j2ee.internal.reference; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.j2ee.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.Description; @@ -29,6 +28,7 @@ import org.eclipse.jst.j2ee.ejb.EjbFactory; import org.eclipse.jst.j2ee.ejb.EjbPackage; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.MessageDriven; +import org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; import org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperation; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceCreationOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceCreationOperation.java index 28c3c8858..72c2f6ae3 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceCreationOperation.java @@ -10,13 +10,13 @@ package org.eclipse.jst.j2ee.internal.reference; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.jst.j2ee.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.Description; import org.eclipse.jst.j2ee.common.ResourceEnvRef; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; import org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperation; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceCreationOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceCreationOperation.java index c48faf71b..7a8386062 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceCreationOperation.java @@ -10,7 +10,6 @@ package org.eclipse.jst.j2ee.internal.reference; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.jst.j2ee.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.Description; @@ -19,6 +18,7 @@ import org.eclipse.jst.j2ee.common.ResSharingScopeType; import org.eclipse.jst.j2ee.common.ResourceRef; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; import org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperation; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceCreationOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceCreationOperation.java index 1057de5a1..10b3e8252 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceCreationOperation.java @@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.j2ee.client.ApplicationClient; -import org.eclipse.jst.j2ee.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.Description; @@ -22,6 +21,7 @@ import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.internal.J2EEEditModel; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl; import org.eclipse.jst.j2ee.internal.webservices.WebServiceClientGenerator; import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataRegistry; import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager; diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java index 2a13ca1f4..6d297a868 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java @@ -46,9 +46,9 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.internal.core.JavaModel; import org.eclipse.jst.j2ee.application.ApplicationFactory; import org.eclipse.jst.j2ee.application.ApplicationPackage; -import org.eclipse.jst.j2ee.application.impl.ApplicationFactoryImpl; -import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationFactoryImpl; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.deployables.JavaDeployableModuleBuilderFactory; import org.eclipse.jst.j2ee.internal.modulecore.util.EarEditAdapterFactory; import org.eclipse.jst.j2ee.internal.validation.ResourceUtil; diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java index 91a8bbe61..f83c62571 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/EarHelper.java @@ -14,9 +14,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.j2ee.application.impl.ApplicationImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants; +import org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.model.internal.validation.EarValidator; diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml index 6821cc4d3..114db21d0 100644 --- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml +++ b/plugins/org.eclipse.jst.servlet.ui/plugin.xml @@ -195,10 +195,10 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> @@ -237,19 +237,19 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.webapplication.impl.WebAppImpl"> + name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ApplicationImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> </objectClass> <objectClass - name="org.eclipse.jst.j2ee.application.impl.ModuleImpl"> + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> </objectClass> </or> </enablement> @@ -277,7 +277,7 @@ </or> </and> <objectClass - name="org.eclipse.jst.j2ee.webapplication.impl.WebAppImpl"> + name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"> @@ -293,7 +293,7 @@ <enablement> <or> <objectClass - name="org.eclipse.jst.j2ee.webapplication.impl.WebAppImpl"> + name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl"> </objectClass> <objectClass name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"> |