geronimo-scm mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	de...@apache.org
Subject	svn commit: r946542 [3/4] - in /geronimo/devtools/eclipse-plugin/trunk: features/org.apache.geronimo.v30.feature/ plugins/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/ plugins/org.apache.geron...
Date	Thu, 20 May 2010 06:51:27 GMT
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ResourceRefSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ResourceRefSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ResourceRefSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ResourceRefSection.java Thu May 20 06:51:22 2010 @@ -20,11 +20,11 @@ import java.util.List; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.j2ee.naming.ResourceRefType; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.v11.ui.Activator; import org.apache.geronimo.st.v11.ui.wizards.ResourceRefWizard; -import org.apache.geronimo.xml.ns.naming_1.ResourceRefType; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.wizard.Wizard; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java Thu May 20 06:51:22 2010 @@ -21,23 +21,23 @@ import java.util.List; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.j2ee.security.DistinguishedNameType; +import org.apache.geronimo.j2ee.security.LoginDomainPrincipalType; +import org.apache.geronimo.j2ee.security.PrincipalType; +import org.apache.geronimo.j2ee.security.RealmPrincipalType; +import org.apache.geronimo.j2ee.security.RoleMappingsType; +import org.apache.geronimo.j2ee.security.RoleType; +import org.apache.geronimo.j2ee.security.SecurityType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.st.core.descriptor.AbstractDeploymentDescriptor; import org.apache.geronimo.st.core.descriptor.ApplicationDeploymentDescriptor; import org.apache.geronimo.st.core.descriptor.EjbDeploymentDescriptor; import org.apache.geronimo.st.core.descriptor.WebDeploymentDescriptor; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; -import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v11.ui.Activator; import org.apache.geronimo.st.v11.ui.wizards.SecurityRoleMappingWizard; -import org.apache.geronimo.xml.ns.security_1.DistinguishedNameType; -import org.apache.geronimo.xml.ns.security_1.LoginDomainPrincipalType; -import org.apache.geronimo.xml.ns.security_1.PrincipalType; -import org.apache.geronimo.xml.ns.security_1.RealmPrincipalType; -import org.apache.geronimo.xml.ns.security_1.RoleMappingsType; -import org.apache.geronimo.xml.ns.security_1.RoleType; -import org.apache.geronimo.xml.ns.security_1.SecurityType; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ILabelProvider; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java Thu May 20 06:51:22 2010 @@ -21,13 +21,13 @@ import java.util.List; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.j2ee.naming.PortCompletionType; +import org.apache.geronimo.j2ee.naming.PortType; +import org.apache.geronimo.j2ee.naming.ServiceRefType; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.v11.ui.Activator; import org.apache.geronimo.st.v11.ui.wizards.ServiceRefWizard; -import org.apache.geronimo.xml.ns.naming_1.PortCompletionType; -import org.apache.geronimo.xml.ns.naming_1.PortType; -import org.apache.geronimo.xml.ns.naming_1.ServiceRefType; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.wizard.Wizard; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebContainerSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebContainerSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebContainerSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebContainerSection.java Thu May 20 06:51:22 2010 @@ -18,12 +18,12 @@ package org.apache.geronimo.st.v11.ui.se import javax.xml.bind.JAXBElement; +import org.apache.geronimo.j2ee.naming.GbeanLocatorType; +import org.apache.geronimo.j2ee.naming.ObjectFactory; +import org.apache.geronimo.j2ee.naming.PatternType; +import org.apache.geronimo.j2ee.web.WebAppType; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractSectionPart; -import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType; -import org.apache.geronimo.xml.ns.naming_1.GbeanLocatorType; -import org.apache.geronimo.xml.ns.naming_1.ObjectFactory; -import org.apache.geronimo.xml.ns.naming_1.PatternType; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/WebGeneralSection.java Thu May 20 06:51:22 2010 @@ -19,8 +19,8 @@ package org.apache.geronimo.st.v11.ui.se import javax.xml.bind.JAXBElement; //import org.apache.geronimo.jee.web.WebApp; +import org.apache.geronimo.j2ee.web.WebAppType; import org.apache.geronimo.st.ui.CommonMessages; -import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/AdminObjectWizard.java Thu May 20 06:51:22 2010 @@ -18,15 +18,15 @@ package org.apache.geronimo.st.v11.ui.wi import java.util.List; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.connector.AdminobjectInstanceType; +import org.apache.geronimo.j2ee.connector.AdminobjectType; +import org.apache.geronimo.j2ee.connector.ConfigPropertySettingType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.st.v11.ui.sections.AdminObjectSection; -import org.apache.geronimo.xml.ns.j2ee.connector_1.AdminobjectInstanceType; -import org.apache.geronimo.xml.ns.j2ee.connector_1.AdminobjectType; -import org.apache.geronimo.xml.ns.j2ee.connector_1.ConfigPropertySettingType; /** * @version $Rev: 720616 $ $Date: 2008-11-26 05:49:55 +0800 (Wed, 26 Nov 2008) $ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ClassFilterWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ClassFilterWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ClassFilterWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ClassFilterWizard.java Thu May 20 06:51:22 2010 @@ -18,15 +18,15 @@ package org.apache.geronimo.st.v11.ui.wi import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.deployment.ClassFilterType; +import org.apache.geronimo.j2ee.deployment.EnvironmentType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.st.v11.ui.sections.ClassFilterSection; -import org.apache.geronimo.xml.ns.deployment_1.ClassFilterType; -import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType; /** * @version $Rev: 720616 $ $Date: 2008-11-26 05:49:55 +0800 (Wed, 26 Nov 2008) $ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java Thu May 20 06:51:22 2010 @@ -18,13 +18,13 @@ package org.apache.geronimo.st.v11.ui.wi import java.util.List; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.deployment.DependencyType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; import org.apache.geronimo.st.v11.core.GeronimoServerInfo; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.deployment_1.DependencyType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v11.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v11.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRelationWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRelationWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRelationWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/EjbRelationWizard.java Thu May 20 06:51:22 2010 @@ -18,16 +18,16 @@ package org.apache.geronimo.st.v11.ui.wi import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.openejb_jar.EjbRelationType; +import org.apache.geronimo.j2ee.openejb_jar.EjbRelationshipRoleType; +import org.apache.geronimo.j2ee.openejb_jar.RelationshipsType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.st.v11.ui.sections.EjbRelationSection; -import org.openejb.xml.ns.openejb_jar_2.EjbRelationType; -import org.openejb.xml.ns.openejb_jar_2.EjbRelationshipRoleType; -import org.openejb.xml.ns.openejb_jar_2.RelationshipsType; /** * @version $Rev: 720616 $ $Date: 2008-11-26 05:49:55 +0800 (Wed, 26 Nov 2008) $ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ExtModuleWizard.java Thu May 20 06:51:22 2010 @@ -20,14 +20,14 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.application.ApplicationType; +import org.apache.geronimo.j2ee.application.ExtModuleType; +import org.apache.geronimo.j2ee.application.PathType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType; -import org.apache.geronimo.xml.ns.j2ee.application_1.ExtModuleType; -import org.apache.geronimo.xml.ns.j2ee.application_1.PathType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java Thu May 20 06:51:22 2010 @@ -18,16 +18,16 @@ package org.apache.geronimo.st.v11.ui.wi import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.naming.GbeanRefType; +import org.apache.geronimo.j2ee.naming.ObjectFactory; +import org.apache.geronimo.j2ee.naming.PatternType; +import org.apache.geronimo.j2ee.web.WebAppType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.j2ee.web_1.WebAppType; -import org.apache.geronimo.xml.ns.naming_1.ObjectFactory; -import org.apache.geronimo.xml.ns.naming_1.PatternType; -import org.apache.geronimo.xml.ns.naming_1.GbeanRefType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; /** * @version $Rev$ $Date$ @@ -94,7 +94,7 @@ public class GBeanRefWizard extends Abst element.select(GBEAN_TYPE); } else if (PatternType.class.isInstance(eObject)) { - textList.get(0).setText(((org.apache.geronimo.xml.ns.naming_1.PatternType)eObject).getName()); + textList.get(0).setText(((org.apache.geronimo.j2ee.naming.PatternType)eObject).getName()); textList.get(1).setText(((PatternType)eObject).getGroupId()); textList.get(2).setText(((PatternType)eObject).getArtifactId()); textList.get(3).setText(((PatternType)eObject).getVersion()); Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java Thu May 20 06:51:22 2010 @@ -17,17 +17,18 @@ package org.apache.geronimo.st.v11.ui.wizards; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; + +import org.apache.geronimo.j2ee.deployment.AttributeType; +import org.apache.geronimo.j2ee.deployment.GbeanType; +import org.apache.geronimo.j2ee.deployment.ObjectFactory; +import org.apache.geronimo.j2ee.deployment.PatternType; +import org.apache.geronimo.j2ee.deployment.ReferenceType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.deployment_1.AttributeType; -import org.apache.geronimo.xml.ns.deployment_1.GbeanType; -import org.apache.geronimo.xml.ns.deployment_1.ObjectFactory; -import org.apache.geronimo.xml.ns.deployment_1.PatternType; -import org.apache.geronimo.xml.ns.deployment_1.ReferenceType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; /** * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java Thu May 20 06:51:22 2010 @@ -20,15 +20,15 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; +import org.apache.geronimo.j2ee.naming.MessageDestinationType; +import org.apache.geronimo.j2ee.naming.PatternType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.naming_1.MessageDestinationType; -import org.apache.geronimo.xml.ns.naming_1.PatternType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ModuleWizard.java Thu May 20 06:51:22 2010 @@ -20,14 +20,14 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.application.ApplicationType; +import org.apache.geronimo.j2ee.application.ModuleType; +import org.apache.geronimo.j2ee.application.PathType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.j2ee.application_1.ApplicationType; -import org.apache.geronimo.xml.ns.j2ee.application_1.ModuleType; -import org.apache.geronimo.xml.ns.j2ee.application_1.PathType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v11.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v11.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleMappingWizard.java Thu May 20 06:51:22 2010 @@ -18,17 +18,17 @@ package org.apache.geronimo.st.v11.ui.wi import java.util.List; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.j2ee.security.DistinguishedNameType; +import org.apache.geronimo.j2ee.security.LoginDomainPrincipalType; +import org.apache.geronimo.j2ee.security.PrincipalType; +import org.apache.geronimo.j2ee.security.RealmPrincipalType; +import org.apache.geronimo.j2ee.security.RoleType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractWizard; import org.apache.geronimo.st.v11.core.GeronimoServerInfo; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.security_1.DistinguishedNameType; -import org.apache.geronimo.xml.ns.security_1.LoginDomainPrincipalType; -import org.apache.geronimo.xml.ns.security_1.PrincipalType; -import org.apache.geronimo.xml.ns.security_1.RealmPrincipalType; -import org.apache.geronimo.xml.ns.security_1.RoleType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Combo; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java Thu May 20 06:51:22 2010 @@ -17,16 +17,17 @@ package org.apache.geronimo.st.v11.ui.wizards; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; + +import org.apache.geronimo.j2ee.naming.PortCompletionType; +import org.apache.geronimo.j2ee.naming.PortType; +import org.apache.geronimo.j2ee.naming.ServiceCompletionType; +import org.apache.geronimo.j2ee.naming.ServiceRefType; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v11.core.jaxb.JAXBObjectFactoryImpl; -import org.apache.geronimo.xml.ns.naming_1.PortCompletionType; -import org.apache.geronimo.xml.ns.naming_1.PortType; -import org.apache.geronimo.xml.ns.naming_1.ServiceCompletionType; -import org.apache.geronimo.xml.ns.naming_1.ServiceRefType; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBObjectFactoryImpl; /** * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml Thu May 20 06:51:22 2010 @@ -150,5 +150,10 @@ <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.devtools</groupId> + <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId> + <version>${version}</version> + </dependency> </dependencies> </project> Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml Thu May 20 06:51:22 2010 @@ -155,5 +155,10 @@ <artifactId>org.apache.geronimo.st.v21.ui</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.devtools</groupId> + <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId> + <version>${version}</version> + </dependency> </dependencies> </project> Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF Thu May 20 06:51:22 2010 @@ -20,6 +20,5 @@ Bundle-ActivationPolicy: lazy Export-Package: org.apache.geronimo.st.v21.core, org.apache.geronimo.st.v21.core.internal, - org.apache.geronimo.st.v21.core.jaxb, org.apache.geronimo.st.v21.core.operations Import-Package: junit.framework Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml Thu May 20 06:51:22 2010 @@ -138,8 +138,5 @@ </default-facets> </extension> - <extension point="org.apache.geronimo.st.core.JAXBUtilsProvider"> - <provider class="org.apache.geronimo.st.v21.core.jaxb.JAXB21Utils" version="2.0,2.1,2.2,3.0"/> - </extension> </plugin> Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml Thu May 20 06:51:22 2010 @@ -157,5 +157,10 @@ <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.devtools</groupId> + <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId> + <version>${version}</version> + </dependency> </dependencies> </project> Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java Thu May 20 06:51:22 2010 @@ -18,6 +18,7 @@ package org.apache.geronimo.st.v21.core; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.jee.application.Application; import org.apache.geronimo.jee.applicationclient.ApplicationClient; import org.apache.geronimo.jee.connector.Connector; @@ -27,7 +28,6 @@ import org.apache.geronimo.jee.openejb.O import org.apache.geronimo.jee.web.WebApp; import org.apache.geronimo.st.core.GeronimoUtils; import org.apache.geronimo.st.core.internal.Trace; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; import org.eclipse.core.resources.IFile; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.server.core.IModule; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java Thu May 20 06:51:22 2010 @@ -24,6 +24,7 @@ import java.util.Set; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.jee.application.Application; import org.apache.geronimo.jee.applicationclient.ApplicationClient; import org.apache.geronimo.jee.connector.Connector; @@ -36,7 +37,6 @@ import org.apache.geronimo.jee.openejb.O import org.apache.geronimo.jee.web.WebApp; import org.apache.geronimo.st.core.DeploymentUtils; import org.apache.geronimo.st.core.GeronimoUtils; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; import org.eclipse.core.resources.IFile; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.server.core.IModule; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java Thu May 20 06:51:22 2010 @@ -44,6 +44,7 @@ import javax.xml.bind.JAXBElement; import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager; import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.config.ConfigurationData; import org.apache.geronimo.kernel.config.ConfigurationInfo; @@ -55,7 +56,6 @@ import org.apache.geronimo.kernel.reposi import org.apache.geronimo.st.core.CommonMessages; import org.apache.geronimo.st.core.GeronimoConnectionFactory; import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; import org.apache.geronimo.st.core.operations.IGeronimoServerPluginManager; import org.apache.geronimo.st.v21.core.internal.Trace; import org.apache.geronimo.system.jmx.KernelDelegate; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java Thu May 20 06:51:22 2010 @@ -18,6 +18,7 @@ package org.apache.geronimo.st.v21.core. import javax.xml.bind.JAXBElement; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.jee.application.Application; import org.apache.geronimo.jee.applicationclient.ApplicationClient; import org.apache.geronimo.jee.connector.Connector; @@ -28,7 +29,6 @@ import org.apache.geronimo.jee.deploymen import org.apache.geronimo.jee.deployment.Environment; import org.apache.geronimo.jee.openejb.OpenejbJar; import org.apache.geronimo.jee.web.WebApp; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation; import org.apache.geronimo.st.core.DeploymentPlanInstallConfig; import org.apache.geronimo.st.v21.core.internal.Trace; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml Thu May 20 06:51:22 2010 @@ -155,5 +155,10 @@ <artifactId>org.apache.geronimo.st.ui</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.devtools</groupId> + <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId> + <version>${version}</version> + </dependency> </dependencies> </project> Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java Thu May 20 06:51:22 2010 @@ -21,7 +21,7 @@ import java.io.IOException; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor; import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java Thu May 20 06:51:22 2010 @@ -19,11 +19,11 @@ package org.apache.geronimo.st.v21.ui.pa import org.apache.geronimo.jee.application.Application; import org.apache.geronimo.jee.applicationclient.ApplicationClient; import org.apache.geronimo.jee.connector.Connector; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor; import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage; import org.apache.geronimo.st.v21.core.GeronimoServerInfo; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v21.ui.sections.AdminObjectSection; import org.apache.geronimo.st.v21.ui.sections.ClassFilterSection; import org.apache.geronimo.st.v21.ui.sections.DependencySection; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java Thu May 20 06:51:22 2010 @@ -16,10 +16,10 @@ / package org.apache.geronimo.st.v21.ui.pages; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage; import org.apache.geronimo.st.v21.core.GeronimoServerInfo; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v21.ui.sections.SecurityAdvancedSection; import org.apache.geronimo.st.v21.ui.sections.SecurityRealmSection; import org.apache.geronimo.st.v21.ui.sections.SecurityRoleMappingSection; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ClassFilterSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ClassFilterSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ClassFilterSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ClassFilterSection.java Thu May 20 06:51:22 2010 @@ -22,9 +22,9 @@ import javax.xml.bind.JAXBElement; import org.apache.geronimo.jee.deployment.ClassFilter; import org.apache.geronimo.jee.deployment.Environment; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; import org.apache.geronimo.st.v21.ui.Activator; import org.apache.geronimo.st.v21.ui.wizards.ClassFilterWizard; import org.eclipse.jface.resource.ImageDescriptor; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java Thu May 20 06:51:22 2010 @@ -21,12 +21,12 @@ import java.util.List; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; import org.apache.geronimo.jee.naming.GbeanRef; import org.apache.geronimo.jee.naming.Pattern; import org.apache.geronimo.jee.web.WebApp; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v21.ui.Activator; import org.apache.geronimo.st.v21.ui.wizards.GBeanRefWizard; import org.eclipse.jface.viewers.ILabelProvider; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java Thu May 20 06:51:22 2010 @@ -21,11 +21,11 @@ import java.util.List; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; import org.apache.geronimo.jee.naming.PersistenceContextRef; import org.apache.geronimo.jee.naming.Property; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v21.ui.Activator; import org.apache.geronimo.st.v21.ui.wizards.PersContextRefWizard; import org.eclipse.jface.viewers.ILabelProvider; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersUnitRefSection.java Thu May 20 06:51:22 2010 @@ -21,10 +21,10 @@ import java.util.List; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; import org.apache.geronimo.jee.naming.PersistenceUnitRef; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v21.ui.Activator; import org.apache.geronimo.st.v21.ui.wizards.PersUnitRefWizard; import org.eclipse.jface.viewers.ILabelProvider; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java Thu May 20 06:51:22 2010 @@ -26,6 +26,7 @@ import java.util.Set; import javax.xml.bind.JAXBElement; import org.apache.geronimo.jee.deployment.Pattern; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; import org.apache.geronimo.jee.security.Role; import org.apache.geronimo.jee.security.RoleMappings; import org.apache.geronimo.jee.security.Security; @@ -33,7 +34,6 @@ import org.apache.geronimo.jee.security. import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.v21.core.GeronimoServerInfo; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v21.ui.wizards.SecurityRunAsSubjectWizard; import org.eclipse.jface.viewers.IBaseLabelProvider; import org.eclipse.jface.viewers.IContentProvider; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java Thu May 20 06:51:22 2010 @@ -21,6 +21,8 @@ import java.util.List; import javax.xml.bind.JAXBElement; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; import org.apache.geronimo.jee.security.DistinguishedName; import org.apache.geronimo.jee.security.LoginDomainPrincipal; import org.apache.geronimo.jee.security.Principal; @@ -32,10 +34,8 @@ import org.apache.geronimo.st.core.descr import org.apache.geronimo.st.core.descriptor.ApplicationDeploymentDescriptor; import org.apache.geronimo.st.core.descriptor.EjbDeploymentDescriptor; import org.apache.geronimo.st.core.descriptor.WebDeploymentDescriptor; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; import org.apache.geronimo.st.v21.ui.Activator; import org.apache.geronimo.st.v21.ui.wizards.SecurityRoleMappingWizard; import org.eclipse.jface.action.IAction; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java Thu May 20 06:51:22 2010 @@ -21,11 +21,11 @@ import java.util.List; import org.apache.geronimo.jee.connector.Adminobject; import org.apache.geronimo.jee.connector.AdminobjectInstance; import org.apache.geronimo.jee.connector.ConfigPropertySetting; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.st.v21.ui.sections.AdminObjectSection; /* Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java Thu May 20 06:51:22 2010 @@ -18,12 +18,12 @@ package org.apache.geronimo.st.v21.ui.wi import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.st.v21.ui.sections.ClassFilterSection; import org.apache.geronimo.jee.deployment.ClassFilter; import org.apache.geronimo.jee.deployment.Environment; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java Thu May 20 06:51:22 2010 @@ -36,12 +36,12 @@ import org.apache.geronimo.jee.deploymen import org.apache.geronimo.jee.deployment.Pattern; import org.apache.geronimo.jee.openejb.OpenejbJar; import org.apache.geronimo.jee.web.WebApp; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.Activator; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.action.Action; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java Thu May 20 06:51:22 2010 @@ -19,12 +19,12 @@ package org.apache.geronimo.st.v21.ui.wi import java.util.List; import org.apache.geronimo.jee.deployment.Dependency; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; import org.apache.geronimo.st.v21.core.GeronimoServerInfo; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v21.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v21.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java Thu May 20 06:51:22 2010 @@ -21,12 +21,12 @@ import javax.xml.bind.JAXBElement; import org.apache.geronimo.jee.openejb.EjbRelation; import org.apache.geronimo.jee.openejb.EjbRelationshipRole; import org.apache.geronimo.jee.openejb.Relationships; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.st.v21.ui.sections.EjbRelationSection; / Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java Thu May 20 06:51:22 2010 @@ -20,12 +20,12 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.jee.application.Application; import org.apache.geronimo.jee.application.ExtModule; import org.apache.geronimo.jee.application.Path; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java Thu May 20 06:51:22 2010 @@ -22,12 +22,12 @@ import org.apache.geronimo.jee.naming.Gb import org.apache.geronimo.jee.naming.ObjectFactory; import org.apache.geronimo.jee.naming.Pattern; import org.apache.geronimo.jee.web.WebApp; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; / * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java Thu May 20 06:51:22 2010 @@ -23,12 +23,12 @@ import org.apache.geronimo.jee.deploymen import org.apache.geronimo.jee.deployment.ObjectFactory; import org.apache.geronimo.jee.deployment.Pattern; import org.apache.geronimo.jee.deployment.Reference; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; /** * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java Thu May 20 06:51:22 2010 @@ -20,13 +20,13 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; -import org.apache.geronimo.st.core.jaxb.JAXBUtils; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.jee.naming.MessageDestination; import org.apache.geronimo.jee.naming.Pattern; import org.eclipse.jface.dialogs.MessageDialog; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java Thu May 20 06:51:22 2010 @@ -20,11 +20,11 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.apache.geronimo.jee.application.Application; import org.apache.geronimo.jee.application.Module; import org.apache.geronimo.jee.application.Path; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java Thu May 20 06:51:22 2010 @@ -23,12 +23,12 @@ import org.apache.geronimo.jee.naming.Pe import org.apache.geronimo.jee.naming.ObjectFactory; import org.apache.geronimo.jee.naming.Pattern; import org.apache.geronimo.jee.naming.Property; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Button; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java Thu May 20 06:51:22 2010 @@ -21,12 +21,12 @@ import javax.xml.bind.JAXBElement; import org.apache.geronimo.jee.naming.PersistenceUnitRef; import org.apache.geronimo.jee.naming.ObjectFactory; import org.apache.geronimo.jee.naming.Pattern; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTreeSection; import org.apache.geronimo.st.ui.wizards.AbstractTreeWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBModelUtils; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Button; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v21.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java Thu May 20 06:51:22 2010 @@ -16,11 +16,11 @@ / package org.apache.geronimo.st.v21.ui.wizards; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; /* * @version $Rev$ $Date$ Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java?rev=946542&r1=946541&r2=946542&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java Thu May 20 06:51:22 2010 @@ -21,13 +21,13 @@ import org.apache.geronimo.jee.loginconf import org.apache.geronimo.jee.naming.Pattern; import org.apache.geronimo.jee.openejb.OpenejbJar; import org.apache.geronimo.jee.web.WebApp; -import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory; +import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory; import org.apache.geronimo.st.ui.Activator; import org.apache.geronimo.st.ui.CommonMessages; import org.apache.geronimo.st.ui.sections.AbstractTableSection; import org.apache.geronimo.st.ui.wizards.AbstractTableWizard; import org.apache.geronimo.st.v21.core.GeronimoServerInfo; -import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl; +import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog;
Mime	Unnamed text/plain (inline, 7-Bit, 89292 bytes)
	View raw message