geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shiv...@apache.org
Subject svn commit: r636035 [1/3] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.runtime.v1/META-INF/ org.apache.geronimo.runtime.v21/META-INF/ org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/wizards/ org.apache.geronimo.st.v...
Date Tue, 11 Mar 2008 17:53:18 GMT
Author: shivahr
Date: Tue Mar 11 10:53:06 2008
New Revision: 636035

URL: http://svn.apache.org/viewvc?rev=636035&view=rev
Log:
GERONIMODEVTOOLS-278 Model framework for G deployment plans - Change from existing EMF to JAXB
Thanks Yun Feng for the second patch.

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBModelUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBObjectFactoryImpl.java
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoV20Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/operations/V20DeploymentPlanCreationOperation.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/EMFEditorContext.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/NamingFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/SecurityPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/AppGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/CommonGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ConnectorGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/DependencySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbLocalRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/EjbRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ImportSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/OpenEjbJarGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceEnvRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ResourceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecurityRootSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/SecuritySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebContainerSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/WebGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbLocalRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/EjbRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/GBeanWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceEnvRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ResourceRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/SecurityRoleWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/ServiceRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBObjectFactoryImpl.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbLocalRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF Tue Mar 11 10:53:06 2008
@@ -16,171 +16,5 @@
  lib/geronimo-deploy-jsr88-1.0.jar,
  lib/geronimo-connector-builder-1.0.jar,
  lib/geronimo-common-1.0.jar
-Export-Package: 
- noNamespace,
- noNamespace.impl,
- org.apache.geronimo.common,
- org.apache.geronimo.common.propertyeditor,
- org.apache.geronimo.connector.deployment,
- org.apache.geronimo.connector.deployment.dconfigbean,
- org.apache.geronimo.connector.deployment.jsr88,
- org.apache.geronimo.deployment.javabean.xbeans,
- org.apache.geronimo.deployment.javabean.xbeans.impl,
- org.apache.geronimo.deployment.plugin,
- org.apache.geronimo.deployment.plugin.application,
- org.apache.geronimo.deployment.plugin.client,
- org.apache.geronimo.deployment.plugin.factories,
- org.apache.geronimo.deployment.plugin.jmx,
- org.apache.geronimo.deployment.plugin.local,
- org.apache.geronimo.deployment.plugin.remote,
- org.apache.geronimo.deployment.service,
- org.apache.geronimo.deployment.xbeans,
- org.apache.geronimo.deployment.xbeans.impl,
- org.apache.geronimo.deployment.xmlbeans,
- org.apache.geronimo.gbean,
- org.apache.geronimo.gbean.runtime,
- org.apache.geronimo.j2ee,
- org.apache.geronimo.j2ee.deployment,
- org.apache.geronimo.kernel,
- org.apache.geronimo.kernel.basic,
- org.apache.geronimo.kernel.config,
- org.apache.geronimo.kernel.jmx,
- org.apache.geronimo.kernel.lifecycle,
- org.apache.geronimo.kernel.log,
- org.apache.geronimo.kernel.management,
- org.apache.geronimo.kernel.proxy,
- org.apache.geronimo.kernel.repository,
- org.apache.geronimo.naming.deployment,
- org.apache.geronimo.schema,
- org.apache.geronimo.security.deployment,
- org.apache.geronimo.util,
- org.apache.geronimo.util.asn1,
- org.apache.geronimo.util.asn1.cryptopro,
- org.apache.geronimo.util.asn1.misc,
- org.apache.geronimo.util.asn1.oiw,
- org.apache.geronimo.util.asn1.pkcs,
- org.apache.geronimo.util.asn1.sec,
- org.apache.geronimo.util.asn1.util,
- org.apache.geronimo.util.asn1.x509,
- org.apache.geronimo.util.asn1.x9,
- org.apache.geronimo.util.crypto,
- org.apache.geronimo.util.crypto.params,
- org.apache.geronimo.util.encoders,
- org.apache.geronimo.util.jce,
- org.apache.geronimo.util.jce.interfaces,
- org.apache.geronimo.util.jce.provider,
- org.apache.geronimo.web.deployment,
- org.apache.geronimo.xbeans.geronimo,
- org.apache.geronimo.xbeans.geronimo.impl,
- org.apache.geronimo.xbeans.geronimo.j2ee,
- org.apache.geronimo.xbeans.geronimo.j2ee.impl,
- org.apache.geronimo.xbeans.geronimo.loginconfig,
- org.apache.geronimo.xbeans.geronimo.loginconfig.impl,
- org.apache.geronimo.xbeans.geronimo.naming,
- org.apache.geronimo.xbeans.geronimo.naming.impl,
- org.apache.geronimo.xbeans.geronimo.security,
- org.apache.geronimo.xbeans.geronimo.security.impl,
- org.apache.geronimo.xbeans.geronimo.web,
- org.apache.geronimo.xbeans.geronimo.web.impl,
- org.apache.geronimo.xbeans.j2ee,
- org.apache.geronimo.xbeans.j2ee.impl,
- org.openejb.corba.security.config.css,
- org.openejb.corba.security.config.tss,
- org.openejb.deployment,
- org.openejb.deployment.ant,
- org.openejb.deployment.corba,
- org.openejb.transaction,
- org.openejb.xbeans.csiv2.css,
- org.openejb.xbeans.csiv2.css.impl,
- org.openejb.xbeans.csiv2.tss,
- org.openejb.xbeans.csiv2.tss.impl,
- org.openejb.xbeans.ejbjar,
- org.openejb.xbeans.ejbjar.impl,
- org.w3.xml.x1998.namespace,
- org.w3.xml.x1998.namespace.impl,
- schemaorg_apache_xmlbeans.attribute.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.attributegroup.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_490901EEEE794AA9D7B07ED01DA009061F60AF28,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_7251B725FC9F02F681709691F7136DA208598D63,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_745F47B428D958143F9ACE415EA6020352C7F9BC,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_A167ACD0272DCB5F18669A34CFFFE95AE05EF6C4,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_D9FB8658251CDD8B8B2F5F500BEE7E4F0571A9C7,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_DC5D66D94632D15C93EAEF3369C17D68EDABD42C,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_E45BC9064CB23F4572BD1CD78A10AC6240592D53,
- schemaorg_apache_xmlbeans.element._nons,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E0,
- schemaorg_apache_xmlbeans.element.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fj2ee,
- schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_A167ACD0272DCB5F18669A34CFFFE95AE05EF6C4,
- schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_D9FB8658251CDD8B8B2F5F500BEE7E4F0571A9C7,
- schemaorg_apache_xmlbeans.identityconstraint.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fj2ee,
- schemaorg_apache_xmlbeans.javaname.noNamespace,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.javabean.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.xbeans,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.j2ee,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.loginconfig,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.naming,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.web,
- schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.j2ee,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css.CSSCssType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css.CSSSECIOPType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.css.CSSSSLType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSSECIOPType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSSSLType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSSasMechType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.csiv2.tss.TSSTssType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEjbRelationshipRoleType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEjbRelationshipRoleType.RoleMapping,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEntityBeanType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbEntityBeanType.Cache,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbGroupType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbQueryType,
- schemaorg_apache_xmlbeans.javaname.org.openejb.xbeans.ejbjar.OpenejbQueryType.QueryMethod,
- schemaorg_apache_xmlbeans.javaname.org.w3.xml.x1998.namespace,
- schemaorg_apache_xmlbeans.javaname.org.w3.xml.x1998.namespace.SpaceAttribute,
- schemaorg_apache_xmlbeans.modelgroup.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.modelgroup.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.modelgroup.URI_SHA_1_A167ACD0272DCB5F18669A34CFFFE95AE05EF6C4,
- schemaorg_apache_xmlbeans.modelgroup.URI_SHA_1_E45BC9064CB23F4572BD1CD78A10AC6240592D53,
- schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E0,
- schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fj2ee,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_490901EEEE794AA9D7B07ED01DA009061F60AF28,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_7251B725FC9F02F681709691F7136DA208598D63,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_745F47B428D958143F9ACE415EA6020352C7F9BC,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_A167ACD0272DCB5F18669A34CFFFE95AE05EF6C4,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_D9FB8658251CDD8B8B2F5F500BEE7E4F0571A9C7,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_DC5D66D94632D15C93EAEF3369C17D68EDABD42C,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_E45BC9064CB23F4572BD1CD78A10AC6240592D53,
- schemaorg_apache_xmlbeans.namespace._nons,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E0,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fj2ee,
- schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
- schemaorg_apache_xmlbeans.src.http_3A_2F_2Fwww_2Eibm_2Ecom_2Fwebservices_2Fxsd,
- schemaorg_apache_xmlbeans.src.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001,
- schemaorg_apache_xmlbeans.src.modules,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_490901EEEE794AA9D7B07ED01DA009061F60AF28,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_7251B725FC9F02F681709691F7136DA208598D63,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_745F47B428D958143F9ACE415EA6020352C7F9BC,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_A167ACD0272DCB5F18669A34CFFFE95AE05EF6C4,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_D9FB8658251CDD8B8B2F5F500BEE7E4F0571A9C7,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_DC5D66D94632D15C93EAEF3369C17D68EDABD42C,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_E45BC9064CB23F4572BD1CD78A10AC6240592D53,
- schemaorg_apache_xmlbeans.type._nons,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E0,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fj2ee
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
 Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Tue Mar 11 10:53:06 2008
@@ -93,24 +93,6 @@
  org.apache.geronimo.system.sharedlib,
  org.apache.geronimo.system.threads,
  org.apache.geronimo.system.util,
- org.apache.geronimo.util,
- org.apache.geronimo.util.asn1,
- org.apache.geronimo.util.asn1.cryptopro,
- org.apache.geronimo.util.asn1.misc,
- org.apache.geronimo.util.asn1.oiw,
- org.apache.geronimo.util.asn1.pkcs,
- org.apache.geronimo.util.asn1.sec,
- org.apache.geronimo.util.asn1.util,
- org.apache.geronimo.util.asn1.x9,
- org.apache.geronimo.util.asn1.x509,
- org.apache.geronimo.util.crypto,
- org.apache.geronimo.util.crypto.digests,
- org.apache.geronimo.util.crypto.modes,
- org.apache.geronimo.util.crypto.params,
- org.apache.geronimo.util.encoders,
- org.apache.geronimo.util.jce,
- org.apache.geronimo.util.jce.interfaces,
- org.apache.geronimo.util.jce.provider,
  org.apache.geronimo.web.deployment,
  org.apache.geronimo.web25.deployment,
  org.apache.geronimo.xbeans.geronimo,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java Tue Mar 11 10:53:06 2008
@@ -64,8 +64,8 @@
 		if (eObject == null) {
 			eObject = getEFactory().create(section.getTableEntryObjectType());
 			List container = section.getObjectContainer();
-			System.out.println( "-==--=-=" + container );
 			container.add(eObject);
+			System.out.println( "-==--=-=" + container );
 		}
 
 		processEAttributes(getPages()[0]);
@@ -152,7 +152,6 @@
 				data.grabExcessHorizontalSpace = true;
 				data.widthHint = 100;
 				text.setLayoutData(data);
-				System.out.println( "Null :  " + eObject);
 				if (eObject != null) {
 					String value = (String) JAXBUtils.getValue(eObject,getTableColumnEAttributes()[i]);
 					if (value != null) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF Tue Mar 11 10:53:06 2008
@@ -14,7 +14,7 @@
  org.apache.geronimo.st.core,
  org.eclipse.jst.common.frameworks,
  org.eclipse.wst.common.modulecore,
- org.apache.geronimo.v11.deployment.model
+ org.apache.geronimo.deployment.v21.jaxbmodel
 Eclipse-LazyStart: true
 Export-Package: 
  org,
@@ -24,4 +24,5 @@
  org.apache.geronimo.st.v20,
  org.apache.geronimo.st.v20.core,
  org.apache.geronimo.st.v20.core.internal,
+ org.apache.geronimo.st.v20.core.jaxb,
  org.apache.geronimo.st.v20.core.operations

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=636035&r1=636034&r2=636035&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 Tue Mar 11 10:53:06 2008
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
+            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoV20Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoV20Utils.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoV20Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/GeronimoV20Utils.java Tue Mar 11 10:53:06 2008
@@ -18,44 +18,36 @@
 
 import java.io.IOException;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
 import org.apache.geronimo.deployment.xbeans.EnvironmentDocument;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.st.core.GeronimoUtils;
-import org.apache.geronimo.xml.ns.deployment.ArtifactType;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.apache.geronimo.xml.ns.deployment.EnvironmentType;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
-import org.apache.geronimo.xml.ns.j2ee.application.util.ApplicationResourceFactoryImpl;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
-import org.apache.geronimo.xml.ns.j2ee.connector.util.ConnectorResourceFactoryImpl;
-import org.apache.geronimo.xml.ns.j2ee.web.DocumentRoot;
-import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
-import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
-import org.apache.geronimo.xml.ns.j2ee.web.util.WebResourceFactoryImpl;
+import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
+import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
+import org.apache.geronimo.xml.ns.j2ee.application_2.ApplicationType;
+import org.apache.geronimo.xml.ns.j2ee.connector_1.ConnectorType;
+import org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.OpenejbJarType;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.wst.common.componentcore.ComponentCore;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.server.core.IModule;
-import org.openejb.xml.ns.openejb.jar.JarPackage;
-import org.openejb.xml.ns.openejb.jar.OpenejbJarType;
-import org.openejb.xml.ns.openejb.jar.util.JarResourceFactoryImpl;
 
 /**
  * @version $Rev$ $Date$
  */
 public class GeronimoV20Utils extends GeronimoUtils {
 	
-	public static EObject getDeploymentPlan(IFile file) {
+	public static JAXBElement getDeploymentPlan(IFile file) {
 		if (!file.exists())
 			return null;
 
@@ -111,25 +103,25 @@
 
 		EnvironmentType environment = null;
 		if (isWebModule(module)) {
-			WebAppType plan = getWebDeploymentPlan(module);
+			WebAppType plan = getWebDeploymentPlan(module).getValue();
 			if (plan != null)
 				environment = plan.getEnvironment();
 		} else if (isEjbJarModule(module)) {
-			OpenejbJarType plan = getOpenEjbDeploymentPlan(module);
-			if (plan != null)
-				environment = plan.getEnvironment();
+			OpenejbJarType plan = getOpenEjbDeploymentPlan(module).getValue();
+//			if (plan != null)
+//				environment = plan.getEnvironment();
 		} else if (isEarModule(module)) {
-			ApplicationType plan = getApplicationDeploymentPlan(module);
+			ApplicationType plan = getApplicationDeploymentPlan(module).getValue();
 			if (plan != null)
 				environment = plan.getEnvironment();
 		} else if (isRARModule(module)) {
-			ConnectorType plan = getConnectorDeploymentPlan(module);
+			ConnectorType plan = getConnectorDeploymentPlan(module).getValue();
 			if (plan != null)
 				environment = plan.getEnvironment();
 		}
 
 		if (environment != null
-				&& environment.eIsSet(DeploymentPackage.eINSTANCE.getEnvironmentType_ModuleId())) {
+				&& environment.getModuleId() != null) {
 			return getQualifiedConfigID(environment.getModuleId());
 		}
 
@@ -147,7 +139,7 @@
 	public static String getContextRoot(IModule module) {
 		String contextRoot = null;
 
-		WebAppType deploymentPlan = getWebDeploymentPlan(module);
+		WebAppType deploymentPlan = getWebDeploymentPlan(module).getValue();
 		if (deploymentPlan != null)
 			contextRoot = deploymentPlan.getContextRoot();
 
@@ -157,82 +149,100 @@
 		return contextRoot;
 	}
 
-	public static WebAppType getWebDeploymentPlan(IModule module) {
+	public static JAXBElement<WebAppType> getWebDeploymentPlan(IModule module) {
 		return getWebDeploymentPlan(getVirtualComponent(module));
 	}
 
-	public static ApplicationType getApplicationDeploymentPlan(IModule module) {
+	public static JAXBElement<ApplicationType> getApplicationDeploymentPlan(IModule module) {
 		return getApplicationDeploymentPlan(getVirtualComponent(module));
 	}
 
-	public static OpenejbJarType getOpenEjbDeploymentPlan(IModule module) {
+	public static JAXBElement<OpenejbJarType> getOpenEjbDeploymentPlan(IModule module) {
 		return getOpenEjbDeploymentPlan(getVirtualComponent(module));
 	}
 
-	public static ConnectorType getConnectorDeploymentPlan(IModule module) {
+	public static JAXBElement<ConnectorType> getConnectorDeploymentPlan(IModule module) {
 		return getConnectorDeploymentPlan(getVirtualComponent(module));
 	}
 
-	public static ApplicationType getApplicationDeploymentPlan(IVirtualComponent comp) {
+	public static JAXBElement<ApplicationType> getApplicationDeploymentPlan(IVirtualComponent comp) {
 		return getApplicationDeploymentPlan(getApplicationDeploymentPlanFile(comp));
 	}
 
-	public static WebAppType getWebDeploymentPlan(IVirtualComponent comp) {
+	public static JAXBElement<WebAppType> getWebDeploymentPlan(IVirtualComponent comp) {
 		return getWebDeploymentPlan(getWebDeploymentPlanFile(comp));
 	}
 
-	public static OpenejbJarType getOpenEjbDeploymentPlan(IVirtualComponent comp) {
+	public static JAXBElement<OpenejbJarType> getOpenEjbDeploymentPlan(IVirtualComponent comp) {
 		return getOpenEjbDeploymentPlan(getOpenEjbDeploymentPlanFile(comp));
 	}
 
-	public static ConnectorType getConnectorDeploymentPlan(IVirtualComponent comp) {
+	public static JAXBElement<ConnectorType> getConnectorDeploymentPlan(IVirtualComponent comp) {
 		return getConnectorDeploymentPlan(getConnectorDeploymentPlanFile(comp));
 	}
 
-	public static ApplicationType getApplicationDeploymentPlan(IFile file) {
+	public static JAXBElement<ApplicationType> getApplicationDeploymentPlan(IFile file) {
 		if (file.getName().equals(APP_PLAN_NAME) && file.exists()) {
-			ResourceSet resourceSet = new ResourceSetImpl();
-			register(resourceSet, new ApplicationResourceFactoryImpl(), ApplicationPackage.eINSTANCE, ApplicationPackage.eNS_URI);
-			Resource resource = load(file, resourceSet);
-			if (resource != null) {
-				return ((org.apache.geronimo.xml.ns.j2ee.application.DocumentRoot) resource.getContents().get(0)).getApplication();
-			}
+//			ResourceSet resourceSet = new ResourceSetImpl();
+//			register(resourceSet, new ApplicationResourceFactoryImpl(), ApplicationPackage.eINSTANCE, ApplicationPackage.eNS_URI);
+//			Resource resource = load(file, resourceSet);
+//			if (resource != null) {
+//				return ((org.apache.geronimo.xml.ns.j2ee.application.DocumentRoot) resource.getContents().get(0)).getApplication();
+//			}
+			return unmarshalDeploymentPlan( file );
 		}
 		return null;
 	}
 
-	public static WebAppType getWebDeploymentPlan(IFile file) {
+	public static JAXBElement<WebAppType> getWebDeploymentPlan(IFile file) {
 		if (file.getName().equals(WEB_PLAN_NAME) && file.exists()) {
-			ResourceSet resourceSet = new ResourceSetImpl();
-			register(resourceSet, new WebResourceFactoryImpl(), WebPackage.eINSTANCE, WebPackage.eNS_URI);
-			Resource resource = load(file, resourceSet);
-			if (resource != null) {
-				return ((DocumentRoot) resource.getContents().get(0)).getWebApp();
-			}
+//			ResourceSet resourceSet = new ResourceSetImpl();
+//			register(resourceSet, new WebResourceFactoryImpl(), WebPackage.eINSTANCE, WebPackage.eNS_URI);
+//			Resource resource = load(file, resourceSet);
+//			if (resource != null) {
+//				return ((DocumentRoot) resource.getContents().get(0)).getWebApp();
+//			}
+			return unmarshalDeploymentPlan( file );
 		}
 		return null;
 	}
 
-	public static OpenejbJarType getOpenEjbDeploymentPlan(IFile file) {
+	public static JAXBElement<OpenejbJarType> getOpenEjbDeploymentPlan(IFile file) {
 		if (file.getName().equals(OPENEJB_PLAN_NAME) && file.exists()) {
-			ResourceSet resourceSet = new ResourceSetImpl();
-			register(resourceSet, new JarResourceFactoryImpl(), JarPackage.eINSTANCE, JarPackage.eNS_URI);
-			Resource resource = load(file, resourceSet);
-			if (resource != null) {
-				return ((org.openejb.xml.ns.openejb.jar.DocumentRoot) resource.getContents().get(0)).getOpenejbJar();
-			}
+//			ResourceSet resourceSet = new ResourceSetImpl();
+//			register(resourceSet, new JarResourceFactoryImpl(), JarPackage.eINSTANCE, JarPackage.eNS_URI);
+//			Resource resource = load(file, resourceSet);
+//			if (resource != null) {
+//				return ((org.openejb.xml.ns.openejb.jar.DocumentRoot) resource.getContents().get(0)).getOpenejbJar();
+//			}
+			return unmarshalDeploymentPlan( file );
 		}
 		return null;
 	}
 
-	public static ConnectorType getConnectorDeploymentPlan(IFile file) {
+	public static JAXBElement<ConnectorType> getConnectorDeploymentPlan(IFile file) {
 		if (file.getName().equals(CONNECTOR_PLAN_NAME) && file.exists()) {
-			ResourceSet resourceSet = new ResourceSetImpl();
-			register(resourceSet, new ConnectorResourceFactoryImpl(), ConnectorPackage.eINSTANCE, ConnectorPackage.eNS_URI);
-			Resource resource = load(file, resourceSet);
-			if (resource != null) {
-				return ((org.apache.geronimo.xml.ns.j2ee.connector.DocumentRoot) resource.getContents().get(0)).getConnector();
-			}
+//			ResourceSet resourceSet = new ResourceSetImpl();
+//			register(resourceSet, new ConnectorResourceFactoryImpl(), ConnectorPackage.eINSTANCE, ConnectorPackage.eNS_URI);
+//			Resource resource = load(file, resourceSet);
+//			if (resource != null) {
+//				return ((org.apache.geronimo.xml.ns.j2ee.connector.DocumentRoot) resource.getContents().get(0)).getConnector();
+//			}
+			return unmarshalDeploymentPlan( file );
+		}
+		return null;
+	}
+	
+	private static JAXBElement unmarshalDeploymentPlan( IFile file ) {
+		try {
+	    	JAXBContext jb = JAXBContext.newInstance( "org.apache.geronimo.xml.ns.j2ee.web_2_0:org.apache.geronimo.xml.ns.j2ee.application_2:org.apache.geronimo.xml.ns.deployment_1:org.apache.geronimo.xml.ns.naming_1:org.apache.geronimo.xml.ns.security_2", Activator.class.getClassLoader() );
+	    	Unmarshaller ums = jb.createUnmarshaller();
+	    	JAXBElement plan = (JAXBElement)ums.unmarshal( file.getContents() );
+	    	return plan;
+		} catch ( JAXBException e ) {
+			e.printStackTrace();
+		} catch ( CoreException e ) {
+			e.printStackTrace();
 		}
 		return null;
 	}

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBModelUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBModelUtils.java?rev=636035&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBModelUtils.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBModelUtils.java Tue Mar 11 10:53:06 2008
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v20.core.jaxb;
+
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
+import org.apache.geronimo.xml.ns.security_2.SecurityType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JAXBModelUtils {
+	
+	public static SecurityType getSecurityType(JAXBElement element) {
+		Object plan = element.getValue();
+		if ( WebAppType.class.isInstance( plan ) ) {
+			return ((WebAppType)plan).getSecurity() == null ? null : (SecurityType)((WebAppType)plan).getSecurity().getValue();
+		}
+		return null;
+	}
+	
+	public static void setSecurityType(JAXBElement element, SecurityType security) {
+		Object plan = element.getValue();
+		if ( WebAppType.class.isInstance( plan ) ) {
+			((WebAppType)plan).setSecurity((new org.apache.geronimo.xml.ns.security_2.ObjectFactory()).createSecurity( security ) );
+		}
+	}
+	
+	public static EnvironmentType getEnvironmentType(JAXBElement element) {
+		Object plan = element.getValue();
+		if ( WebAppType.class.isInstance( plan ) ) {
+			return ((WebAppType)plan).getEnvironment() == null ? null : ((WebAppType)plan).getEnvironment();
+		}
+		return null;
+	}
+	
+	public static List getServiceOrPersistence(JAXBElement element) {
+		Object plan = element.getValue();
+		if ( WebAppType.class.isInstance( plan ) ) {
+			return ((WebAppType)plan).getServiceOrPersistence() == null ? null : ((WebAppType)plan).getServiceOrPersistence();
+		}
+		return null;
+	}
+}

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBObjectFactoryImpl.java?rev=636035&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBObjectFactoryImpl.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBObjectFactoryImpl.java Tue Mar 11 10:53:06 2008
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v20.core.jaxb;
+
+import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
+import org.apache.geronimo.xml.ns.deployment_1.GbeanType;
+import org.apache.geronimo.xml.ns.naming_1.ObjectFactory;
+import org.apache.geronimo.xml.ns.naming_1.ResourceRefType;
+import org.apache.geronimo.xml.ns.security_2.DescriptionType;
+import org.apache.geronimo.xml.ns.security_2.RoleMappingsType;
+import org.apache.geronimo.xml.ns.security_2.RoleType;
+import org.apache.geronimo.xml.ns.security_2.SecurityType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JAXBObjectFactoryImpl implements JAXBObjectFactory {
+
+	private static JAXBObjectFactoryImpl instance = new JAXBObjectFactoryImpl();
+	
+	private JAXBObjectFactoryImpl() {
+		
+	}
+	
+	public static JAXBObjectFactoryImpl getInstance() {
+		return instance;
+	}
+	
+	public Object create(Class type) {
+		System.out.println( type );
+		if ( type.equals( ResourceRefType.class ) ) {
+			return (new ObjectFactory()).createResourceRefType();
+		} else if ( type.equals( SecurityType.class ) ) {
+			return (new org.apache.geronimo.xml.ns.security_2.ObjectFactory()).createSecurityType();
+		} else if ( type.equals( RoleMappingsType.class ) ) {
+			return (new org.apache.geronimo.xml.ns.security_2.ObjectFactory()).createRoleMappingsType();
+		} else if ( type.equals( DescriptionType.class ) ) {
+			return (new org.apache.geronimo.xml.ns.security_2.ObjectFactory()).createDescriptionType();
+		} else if ( type.equals( RoleType.class ) ) {
+			return (new org.apache.geronimo.xml.ns.security_2.ObjectFactory()).createRoleType();
+		} else if ( type.equals( GbeanType.class ) ) {
+			return (new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory()).createGbeanType();
+		}
+		
+		return null;
+	}
+
+}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/operations/V20DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/operations/V20DeploymentPlanCreationOperation.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/operations/V20DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/operations/V20DeploymentPlanCreationOperation.java Tue Mar 11 10:53:06 2008
@@ -16,44 +16,29 @@
  */
 package org.apache.geronimo.st.v20.core.operations;
 
+import java.net.URI;
+
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+import javax.xml.bind.JAXBElement;
+
 import org.apache.geronimo.st.core.GeronimoSchemaNS;
 import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation;
 import org.apache.geronimo.st.v20.core.DeploymentPlanInstallConfig;
 import org.apache.geronimo.st.v20.core.GeronimoV20Utils;
 import org.apache.geronimo.st.v20.core.internal.Trace;
-import org.apache.geronimo.xml.ns.deployment.ArtifactType;
-import org.apache.geronimo.xml.ns.deployment.DependenciesType;
-import org.apache.geronimo.xml.ns.deployment.DependencyType;
-import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.apache.geronimo.xml.ns.deployment.DocumentRoot;
-import org.apache.geronimo.xml.ns.deployment.EnvironmentType;
-import org.apache.geronimo.xml.ns.deployment.ModuleType;
-import org.apache.geronimo.xml.ns.deployment.util.DeploymentResourceFactoryImpl;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationFactory;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
-import org.apache.geronimo.xml.ns.j2ee.application.util.ApplicationResourceFactoryImpl;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorFactory;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
-import org.apache.geronimo.xml.ns.j2ee.connector.util.ConnectorResourceFactoryImpl;
-import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
-import org.apache.geronimo.xml.ns.j2ee.web.WebFactory;
-import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
-import org.apache.geronimo.xml.ns.j2ee.web.util.WebResourceFactoryImpl;
+import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
+import org.apache.geronimo.xml.ns.deployment_1.DependenciesType;
+import org.apache.geronimo.xml.ns.deployment_1.DependencyType;
+import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
+import org.apache.geronimo.xml.ns.j2ee.application_2.ApplicationType;
+import org.apache.geronimo.xml.ns.j2ee.application_2.ModuleType;
+import org.apache.geronimo.xml.ns.j2ee.connector_1.ConnectorType;
+import org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.GeronimoEjbJarType;
+import org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.OpenejbJarType;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
+import org.eclipse.core.internal.resources.Resource;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.openejb.xml.ns.openejb.jar.JarFactory;
-import org.openejb.xml.ns.openejb.jar.JarPackage;
-import org.openejb.xml.ns.openejb.jar.OpenejbJarType;
-import org.openejb.xml.ns.openejb.jar.util.JarResourceFactoryImpl;
 
 /**
  * @version $Rev: 509704 $ $Date: 2007-02-20 13:42:24 -0500 (Tue, 20 Feb 2007) $
@@ -72,9 +57,15 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public EObject createGeronimoApplicationDeploymentPlan(IFile dpFile) {
+	public JAXBElement createGeronimoApplicationDeploymentPlan(IFile dpFile) {
 //		Trace.trace("Entry", "V20DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", dpFile);
 		
+		org.apache.geronimo.xml.ns.j2ee.application_2.ObjectFactory applicationFactory = new org.apache.geronimo.xml.ns.j2ee.application_2.ObjectFactory();
+		ApplicationType application = applicationFactory.createApplicationType();
+		application.setApplicationName(getProject().getName());
+		application.setEnvironment(getConfigEnvironment());
+		
+/*
 		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString(), false);
 
 		ResourceSet resourceSet = new ResourceSetImpl();
@@ -96,9 +87,9 @@
 		resource.getContents().add(documentRoot);
 
 		save(resource);
-
+*/
 //		Trace.trace("Exit", "V20DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", root);
-		return root;
+		return applicationFactory.createApplication(application);
 	}
 
 	/*
@@ -106,9 +97,11 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoWebDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public EObject createGeronimoWebDeploymentPlan(IFile dpFile) {
+	public JAXBElement createGeronimoWebDeploymentPlan(IFile dpFile) {
 //		Trace.trace("Entry", "V20DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", dpFile);
-
+		org.apache.geronimo.xml.ns.j2ee.web_2_0.ObjectFactory webFactory = new org.apache.geronimo.xml.ns.j2ee.web_2_0.ObjectFactory();
+		WebAppType web = webFactory.createWebAppType();
+/*
 		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString(), false);
 
 		ResourceSet resourceSet = new ResourceSetImpl();
@@ -134,9 +127,9 @@
 		resource.getContents().add(documentRoot);
 
 		save(resource);
-
+*/
 //		Trace.trace("Exit", "V20DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", root);
-		return root;
+		return webFactory.createWebApp(web);
 	}
 
 	/*
@@ -144,9 +137,11 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createOpenEjbDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public EObject createOpenEjbDeploymentPlan(IFile dpFile) {
+	public JAXBElement createOpenEjbDeploymentPlan(IFile dpFile) {
 //		Trace.trace("Entry", "V20DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
-		
+		org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.ObjectFactory ejbFactory = new org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.ObjectFactory();
+		GeronimoEjbJarType ejbjar = ejbFactory.createGeronimoEjbJarType();
+/*
 		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString(), false);
 
 		ResourceSet resourceSet = new ResourceSetImpl();
@@ -170,9 +165,9 @@
 		resource.getContents().add(documentRoot);
 
 		save(resource);
-
+*/
 //		Trace.trace("Exit", "V20DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", root);
-		return root;
+		return ejbFactory.createEjbJar(ejbjar);
 	}
 
 	/*
@@ -180,9 +175,12 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createConnectorDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public EObject createConnectorDeploymentPlan(IFile dpFile) {
+	public JAXBElement createConnectorDeploymentPlan(IFile dpFile) {
 //		Trace.trace("Entry", "V20DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
-		
+		org.apache.geronimo.xml.ns.j2ee.connector_1.ObjectFactory connectorFactory = new org.apache.geronimo.xml.ns.j2ee.connector_1.ObjectFactory();
+		ConnectorType connector = connectorFactory.createConnectorType();
+		return connectorFactory.createConnector(connector);
+/*		
 		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString(), false);
 
 		ResourceSet resourceSet = new ResourceSetImpl();
@@ -202,14 +200,17 @@
 		resource.getContents().add(documentRoot);
 
 		save(resource);
-
+*/
 //		Trace.trace("Exit", "V20DeploymentPlanCreationOperation.createConnectorDeploymentPlan", root);
-		return root;
+//		return root;
 	}
 
-	public EObject createServiceDeploymentPlan(IFile dpFile) {
+	public JAXBElement createServiceDeploymentPlan(IFile dpFile) {
 //		Trace.trace("Entry", "V20DeploymentPlanCreationOperation.createServiceDeploymentPlan", dpFile);
-		
+		org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+		org.apache.geronimo.xml.ns.deployment_1.ModuleType module = serviceFactory.createModuleType();
+		return serviceFactory.createModule(module);
+/*
 		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString(), false);
 
 		ResourceSet resourceSet = new ResourceSetImpl();
@@ -227,9 +228,9 @@
 		resource.getContents().add(documentRoot);
 
 		save(resource);
-
+*/
 //		Trace.trace("Exit", "V20DeploymentPlanCreationOperation.createServiceDeploymentPlan", root);
-		return root;
+//		return root;
 	}
 
 	public EnvironmentType getConfigEnvironment() {
@@ -249,12 +250,14 @@
 				: "car";
 
 		ArtifactType artifact = createArtifactType(groupId, artifactId, version, type);
-		EnvironmentType env = DeploymentFactory.eINSTANCE.createEnvironmentType();
+		org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+		
+		EnvironmentType env = serviceFactory.createEnvironmentType();
 		env.setModuleId(artifact);
 
 		if (cfg != null && cfg.isSharedLib()) {
-			DependenciesType dt = DeploymentFactory.eINSTANCE.createDependenciesType();
-			ArtifactType sharedLib = createDependencyType("org.apache.geronimo.configs", "sharedlib", null, "car");
+			DependenciesType dt = serviceFactory.createDependenciesType();
+			DependencyType sharedLib = createDependencyType("org.apache.geronimo.configs", "sharedlib", null, "car");
 			dt.getDependency().add(sharedLib);
 			env.setDependencies(dt);
 		}
@@ -265,8 +268,8 @@
 
 	public static ArtifactType createArtifactType(String groupId, String artifactId, String version, String type) {
 //		Trace.trace("Entry", "V20DeploymentPlanCreationOperation.createArtifactType", groupId, artifactId, version, type);
-						
-		ArtifactType artifact = DeploymentFactory.eINSTANCE.createArtifactType();
+		org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+		ArtifactType artifact = serviceFactory.createArtifactType();
 		if (groupId != null)
 			artifact.setGroupId(groupId);
 		if (artifactId != null)
@@ -279,10 +282,10 @@
 		return artifact;
 	}
 
-	public static ArtifactType createDependencyType(String groupId, String artifactId, String version, String type) {
+	public static DependencyType createDependencyType(String groupId, String artifactId, String version, String type) {
 //		Trace.trace("Entry", "V20DeploymentPlanCreationOperation.createDependencyType", groupId, artifactId, version, type);
-		
-		DependencyType artifact = DeploymentFactory.eINSTANCE.createDependencyType();
+		org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+		DependencyType artifact = serviceFactory.createDependencyType();
 		if (groupId != null)
 			artifact.setGroupId(groupId);
 		if (artifactId != null)
@@ -302,4 +305,4 @@
 		return attribute != null && attribute.trim().length() != 0;
 	}
 
-}
\ No newline at end of file
+}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF Tue Mar 11 10:53:06 2008
@@ -6,14 +6,15 @@
 Bundle-Activator: org.apache.geronimo.st.v20.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
+ org.eclipse.core.commands,
  org.apache.geronimo.st.v20.core,
  org.apache.geronimo.st.ui,
  org.eclipse.ui.forms,
  org.eclipse.core.resources,
- org.apache.geronimo.v11.deployment.model.edit,
- org.apache.geronimo.v11.deployment.model,
  org.eclipse.wst.common.project.facet.ui,
- org.apache.geronimo.st.v11.ui
+ org.apache.geronimo.st.v11.ui,
+ org.apache.geronimo.runtime.common,
+ org.apache.geronimo.deployment.v21.jaxbmodel
 Eclipse-LazyStart: true
 Bundle-Vendor: Apache.org
 Export-Package: org.apache.geronimo.st.v20.ui,

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=636035&r1=636034&r2=636035&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 Tue Mar 11 10:53:06 2008
@@ -77,12 +77,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
+            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v11.deployment.model.edit</artifactId>
+            <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java Tue Mar 11 10:53:06 2008
@@ -16,9 +16,17 @@
  */
 package org.apache.geronimo.st.v20.ui.editors;
 
+import java.io.File;
+import java.io.IOException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;
 import org.apache.geronimo.st.v20.core.GeronimoV20Utils;
+import org.apache.geronimo.st.v20.ui.Activator;
 import org.apache.geronimo.st.v20.ui.pages.AppGeneralPage;
 import org.apache.geronimo.st.v20.ui.pages.ConnectorOverviewPage;
 import org.apache.geronimo.st.v20.ui.pages.DeploymentPage;
@@ -26,19 +34,10 @@
 import org.apache.geronimo.st.v20.ui.pages.NamingFormPage;
 import org.apache.geronimo.st.v20.ui.pages.SecurityPage;
 import org.apache.geronimo.st.v20.ui.pages.WebGeneralPage;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationFactory;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorFactory;
-import org.apache.geronimo.xml.ns.j2ee.web.WebFactory;
-import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
-import org.apache.geronimo.xml.ns.j2ee.web.impl.WebPackageImpl;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.forms.editor.FormEditor;
 import org.eclipse.ui.forms.editor.FormPage;
-import org.openejb.xml.ns.openejb.jar.JarFactory;
-import org.openejb.xml.ns.openejb.jar.JarPackage;
 
 public class GeronimoFormContentLoader extends AbstractGeronimoFormContentLoader {
 
@@ -49,7 +48,7 @@
 	 */
 	public void addApplicationPlanPages(FormEditor editor) throws PartInitException {
 		editor.addPage(new AppGeneralPage(editor, "appgeneralpage", CommonMessages.editorTabGeneral));
-		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, ApplicationPackage.eINSTANCE.getApplicationType_Security()));
+		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, null));
 		editor.addPage(getApplicationDeploymentPage(editor));
 	}
 
@@ -71,7 +70,7 @@
 	public void addOpenEjbPlanPages(FormEditor editor) throws PartInitException {
 		editor.addPage(new EjbOverviewPage(editor, "ejboverview", CommonMessages.editorTabGeneral));
 		// TODO Add naming page but broken down for each bean type
-		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, JarPackage.eINSTANCE.getOpenejbJarType_Security()));
+		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, null));
 		editor.addPage(getEjbJarDeploymentPage(editor));
 	}
 
@@ -83,7 +82,7 @@
 	public void addWebPlanPages(FormEditor editor) throws PartInitException {
 		editor.addPage(new WebGeneralPage(editor, "generalpage", CommonMessages.editorTabGeneral));
 		editor.addPage(getWebNamingPage(editor));
-		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, WebPackageImpl.eINSTANCE.getWebAppType_Security()));
+		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, null));
 		editor.addPage(getWebDeploymentPage(editor));
 	}
 
@@ -92,47 +91,52 @@
 	 * 
 	 * @see org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader#loadDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public EObject loadDeploymentPlan(IFile file) {
+	public JAXBElement loadDeploymentPlan(IFile file) {
 		return GeronimoV20Utils.getDeploymentPlan(file);
 	}
-
+	
+	public void saveDeploymentPlan(JAXBElement deploymentPlan, IFile file) throws IOException, JAXBException {
+		JAXBContext jb = JAXBContext.newInstance( "org.apache.geronimo.xml.ns.j2ee.web_2_0:org.apache.geronimo.xml.ns.j2ee.application_2:org.apache.geronimo.xml.ns.deployment_1:org.apache.geronimo.xml.ns.naming_1:org.apache.geronimo.xml.ns.security_2", Activator.class.getClassLoader() );
+		jb.createMarshaller().marshal( deploymentPlan, new File( file.getLocationURI().toURL().getFile()) );
+	}
+	
 	protected FormPage getWebNamingPage(FormEditor editor) {
 		NamingFormPage formPage = createNamingFormPage(editor);
-		WebPackage pkg = WebFactory.eINSTANCE.getWebPackage();
-		formPage.ejbLocalRef = pkg.getWebAppType_EjbLocalRef();
-		formPage.ejbRef = pkg.getWebAppType_EjbRef();
-		formPage.resEnvRef = pkg.getWebAppType_ResourceEnvRef();
-		formPage.resRef = pkg.getWebAppType_ResourceRef();
-		formPage.gbeanRef = pkg.getWebAppType_GbeanRef();
-		formPage.serviceRef = pkg.getWebAppType_ServiceRef();
+//		WebPackage pkg = WebFactory.eINSTANCE.getWebPackage();
+//		formPage.ejbLocalRef = pkg.getWebAppType_EjbLocalRef();
+//		formPage.ejbRef = pkg.getWebAppType_EjbRef();
+//		formPage.resEnvRef = pkg.getWebAppType_ResourceEnvRef();
+//		formPage.resRef = pkg.getWebAppType_ResourceRef();
+//		formPage.gbeanRef = pkg.getWebAppType_GbeanRef();
+//		formPage.serviceRef = pkg.getWebAppType_ServiceRef();
 		return formPage;
 	}
 
 	protected FormPage getWebDeploymentPage(FormEditor editor) {
 		DeploymentPage formPage = createDeploymentFormPage(editor);
-		formPage.environment = WebFactory.eINSTANCE.getWebPackage().getWebAppType_Environment();
-		formPage.gbeanERef = WebFactory.eINSTANCE.getWebPackage().getWebAppType_Gbean();
+//		formPage.environment = WebFactory.eINSTANCE.getWebPackage().getWebAppType_Environment();
+//		formPage.gbeanERef = WebFactory.eINSTANCE.getWebPackage().getWebAppType_Gbean();
 		return formPage;
 	}
 
 	private FormPage getEjbJarDeploymentPage(FormEditor editor) {
 		DeploymentPage formPage = createDeploymentFormPage(editor);
-		formPage.environment = JarFactory.eINSTANCE.getJarPackage().getOpenejbJarType_Environment();
-		formPage.gbeanERef = JarFactory.eINSTANCE.getJarPackage().getOpenejbJarType_Gbean();
+//		formPage.environment = JarFactory.eINSTANCE.getJarPackage().getOpenejbJarType_Environment();
+//		formPage.gbeanERef = JarFactory.eINSTANCE.getJarPackage().getOpenejbJarType_Gbean();
 		return formPage;
 	}
 
 	protected FormPage getApplicationDeploymentPage(FormEditor editor) {
 		DeploymentPage formPage = createDeploymentFormPage(editor);
-		formPage.environment = ApplicationFactory.eINSTANCE.getApplicationPackage().getApplicationType_Environment();
-		formPage.gbeanERef = ApplicationFactory.eINSTANCE.getApplicationPackage().getApplicationType_Gbean();
+//		formPage.environment = ApplicationFactory.eINSTANCE.getApplicationPackage().getApplicationType_Environment();
+//		formPage.gbeanERef = ApplicationFactory.eINSTANCE.getApplicationPackage().getApplicationType_Gbean();
 		return formPage;
 	}
 
 	private FormPage getConnectorDeploymentPage(FormEditor editor) {
 		DeploymentPage formPage = createDeploymentFormPage(editor);
-		formPage.environment = ConnectorFactory.eINSTANCE.getConnectorPackage().getConnectorType_Environment();
-		formPage.gbeanERef = ConnectorFactory.eINSTANCE.getConnectorPackage().getConnectorType_Gbean();
+//		formPage.environment = ConnectorFactory.eINSTANCE.getConnectorPackage().getConnectorType_Environment();
+//		formPage.gbeanERef = ConnectorFactory.eINSTANCE.getConnectorPackage().getConnectorType_Gbean();
 		return formPage;
 	}
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/EMFEditorContext.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/EMFEditorContext.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/EMFEditorContext.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/EMFEditorContext.java Tue Mar 11 10:53:06 2008
@@ -16,41 +16,27 @@
  */
 package org.apache.geronimo.st.v20.ui.internal;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.geronimo.xml.ns.deployment.provider.DeploymentItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.application.client.provider.ClientItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.application.provider.ApplicationItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.connector.provider.ConnectorItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.security.provider.SecurityItemProviderAdapterFactory;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.openejb.xml.ns.openejb.jar.provider.JarItemProviderAdapterFactory;
-import org.openejb.xml.ns.pkgen.provider.PkgenItemProviderAdapterFactory;
 
 public class EMFEditorContext {
 	
-	private static ComposedAdapterFactory factory;
-
-	static {
-		List<AdapterFactoryImpl> factories = new ArrayList<AdapterFactoryImpl>();
-		factories.add(new DeploymentItemProviderAdapterFactory());
-		factories.add(new ClientItemProviderAdapterFactory());
-		factories.add(new ApplicationItemProviderAdapterFactory());
-		factories.add(new ConnectorItemProviderAdapterFactory());
-		factories.add(new WebItemProviderAdapterFactory());
-		factories.add(new NamingItemProviderAdapterFactory());
-		factories.add(new SecurityItemProviderAdapterFactory());
-		factories.add(new JarItemProviderAdapterFactory());
-		factories.add(new PkgenItemProviderAdapterFactory());
-		factory = new ComposedAdapterFactory(factories);
-	}
-
-	public static ComposedAdapterFactory getFactory() {
-		return factory;
-	}
+//	private static ComposedAdapterFactory factory;
+//
+//	static {
+//		List<AdapterFactoryImpl> factories = new ArrayList<AdapterFactoryImpl>();
+//		factories.add(new DeploymentItemProviderAdapterFactory());
+//		factories.add(new ClientItemProviderAdapterFactory());
+//		factories.add(new ApplicationItemProviderAdapterFactory());
+//		factories.add(new ConnectorItemProviderAdapterFactory());
+//		factories.add(new WebItemProviderAdapterFactory());
+//		factories.add(new NamingItemProviderAdapterFactory());
+//		factories.add(new SecurityItemProviderAdapterFactory());
+//		factories.add(new JarItemProviderAdapterFactory());
+//		factories.add(new PkgenItemProviderAdapterFactory());
+//		factory = new ComposedAdapterFactory(factories);
+//	}
+//
+//	public static ComposedAdapterFactory getFactory() {
+//		return factory;
+//	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/DeploymentPage.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/DeploymentPage.java Tue Mar 11 10:53:06 2008
@@ -18,17 +18,17 @@
 
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v20.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v20.ui.sections.DependencySection;
 import org.apache.geronimo.st.v20.ui.sections.GBeanSection;
-import org.eclipse.emf.ecore.EReference;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
 
 public class DeploymentPage extends AbstractGeronimoFormPage {
 	
-	public EReference environment;
+//	public EReference environment;
 	
-	public EReference gbeanERef;
+//	public EReference gbeanERef;
 
 	public DeploymentPage(FormEditor editor, String id, String title) {
 		super(editor, id, title);
@@ -40,8 +40,8 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
 	 */
 	protected void fillBody(IManagedForm managedForm) {
-		managedForm.addPart(new DependencySection(getDeploymentPlan(), environment, body, toolkit, getStyle()));
-		managedForm.addPart(new GBeanSection(getDeploymentPlan(), gbeanERef, body, toolkit, getStyle()));
+		managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironmentType(getDeploymentPlan()), body, toolkit, getStyle()));
+		managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getServiceOrPersistence(getDeploymentPlan()), body, toolkit, getStyle()));
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/NamingFormPage.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/NamingFormPage.java Tue Mar 11 10:53:06 2008
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.st.v20.ui.pages;
 
+import java.util.List;
+
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
 import org.apache.geronimo.st.v20.ui.sections.EjbLocalRefSection;
@@ -24,23 +26,22 @@
 import org.apache.geronimo.st.v20.ui.sections.ResourceEnvRefSection;
 import org.apache.geronimo.st.v20.ui.sections.ResourceRefSection;
 import org.apache.geronimo.st.v20.ui.sections.ServiceRefSection;
-import org.eclipse.emf.ecore.EReference;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
 
 public class NamingFormPage extends AbstractGeronimoFormPage {
 
-	public EReference resRef;
+	public List resRef;
 
-	public EReference resEnvRef;
+	public List resEnvRef;
 
-	public EReference ejbRef;
+	public List ejbRef;
 
-	public EReference ejbLocalRef;
+	public List ejbLocalRef;
 
-	public EReference gbeanRef;
+	public List gbeanRef;
 
-	public EReference serviceRef;
+	public List serviceRef;
 
 	public NamingFormPage(FormEditor editor, String id, String title) {
 		super(editor, id, title);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/SecurityPage.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/pages/SecurityPage.java Tue Mar 11 10:53:06 2008
@@ -20,18 +20,18 @@
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
 import org.apache.geronimo.st.v20.ui.sections.SecurityRootSection;
 import org.apache.geronimo.st.v20.ui.sections.SecuritySection;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.security_2.SecurityType;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
 
 public class SecurityPage extends AbstractGeronimoFormPage {
 
-	public EReference securityERef;
+	public SecurityType security;
 
-	public SecurityPage(FormEditor editor, String id, String title, EReference securityERef) {
+	public SecurityPage(FormEditor editor, String id, String title, SecurityType security) {
 		super(editor, id, title);
-		this.securityERef = securityERef;
+		this.security = security;
 	}
 
 	/*
@@ -40,8 +40,8 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
 	 */
 	protected void fillBody(IManagedForm managedForm) {
-		managedForm.addPart(new SecurityRootSection(body, toolkit, getStyle(), getDeploymentPlan(), securityERef));
-		managedForm.addPart(new SecuritySection(getDeploymentPlan(), body, toolkit, getStyle(), securityERef));
+		managedForm.addPart(new SecurityRootSection(body, toolkit, getStyle(), getDeploymentPlan(), security));
+		managedForm.addPart(new SecuritySection(getDeploymentPlan(), body, toolkit, getStyle(), security.getRoleMappings()));
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/AppGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/AppGeneralSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/AppGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/AppGeneralSection.java Tue Mar 11 10:53:06 2008
@@ -16,10 +16,9 @@
  */
 package org.apache.geronimo.st.v20.ui.sections;
 
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.xml.ns.j2ee.application_2.ApplicationType;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
@@ -27,9 +26,9 @@
 
 	ApplicationType plan;
 
-	public AppGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
+	public AppGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
 		super(parent, toolkit, style, plan);
-		this.plan = (ApplicationType) plan;
+		this.plan = (ApplicationType) plan.getValue();
 		createClient();
 	}
 
@@ -38,7 +37,7 @@
 	 * 
 	 * @see org.apache.geronimo.st.v20.ui.sections.CommonGeneralSection#getEnvironmentEReference()
 	 */
-	protected EReference getEnvironmentEReference() {
-		return ApplicationPackage.eINSTANCE.getApplicationType_Environment();
-	}
+//	protected EReference getEnvironmentEReference() {
+//		return ApplicationPackage.eINSTANCE.getApplicationType_Environment();
+//	}
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/CommonGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/CommonGeneralSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/CommonGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/CommonGeneralSection.java Tue Mar 11 10:53:06 2008
@@ -19,17 +19,18 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+import javax.xml.bind.JAXBElement;
+
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
 import org.apache.geronimo.st.v20.core.operations.V20DeploymentPlanCreationOperation;
 import org.apache.geronimo.st.v20.ui.internal.Messages;
-import org.apache.geronimo.xml.ns.deployment.ArtifactType;
-import org.apache.geronimo.xml.ns.deployment.DependenciesType;
-import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.apache.geronimo.xml.ns.deployment.EnvironmentType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
+import org.apache.geronimo.xml.ns.deployment_1.DependenciesType;
+import org.apache.geronimo.xml.ns.deployment_1.DependencyType;
+import org.apache.geronimo.xml.ns.deployment_1.EnvironmentType;
+import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -61,7 +62,7 @@
 	
 	protected Button sharedLibDepends;
 
-	public CommonGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
+	public CommonGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
 		super(parent, toolkit, style, plan);
 	}
 
@@ -193,7 +194,7 @@
 	protected String getGroupId() {
 		ArtifactType moduleId = getModuleId(false);
 		if (moduleId != null
-				&& moduleId.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_GroupId()))
+				&& moduleId.getGroupId() != null)
 			return moduleId.getGroupId();
 		return "";
 	}
@@ -201,7 +202,7 @@
 	protected String getArtifactId() {
 		ArtifactType moduleId = getModuleId(false);
 		if (moduleId != null
-				&& moduleId.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId()))
+				&& moduleId.getArtifactId() != null)
 			return moduleId.getArtifactId();
 		return "";
 	}
@@ -209,7 +210,7 @@
 	protected String getVersion() {
 		ArtifactType moduleId = getModuleId(false);
 		if (moduleId != null
-				&& moduleId.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_Version()))
+				&& moduleId.getVersion() != null)
 			return moduleId.getVersion();
 		return "";
 	}
@@ -217,7 +218,7 @@
 	protected String getArtifactType() {
 		ArtifactType moduleId = getModuleId(false);
 		if (moduleId != null
-				&& moduleId.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_Type()))
+				&& moduleId.getType() != null)
 			return moduleId.getType();
 		return "";
 	}
@@ -243,11 +244,11 @@
 	protected void setInverseClassloading(boolean enable) {
 		if (enable) {
 			EnvironmentType type = getEnvironmentType(true);
-			type.setInverseClassloading(DeploymentFactory.eINSTANCE.createEmptyType());
+			type.setInverseClassloading(getDeploymentObjectFactory().createEmptyType());
 		} else {
 			EnvironmentType type = getEnvironmentType(false);
 			if (type != null) {
-				type.eUnset(DeploymentPackage.eINSTANCE.getEnvironmentType_InverseClassloading());
+				type.setInverseClassloading(null);
 			}
 		}
 	}
@@ -255,11 +256,11 @@
 	protected void setSuppressDefaultEnvironment(boolean enable) {
 		if (enable) {
 			EnvironmentType type = getEnvironmentType(true);
-			type.setSuppressDefaultEnvironment(DeploymentFactory.eINSTANCE.createEmptyType());
+			type.setSuppressDefaultEnvironment(getDeploymentObjectFactory().createEmptyType());
 		} else {
 			EnvironmentType type = getEnvironmentType(false);
 			if (type != null) {
-				type.eUnset(DeploymentPackage.eINSTANCE.getEnvironmentType_SuppressDefaultEnvironment());
+				type.setSuppressDefaultEnvironment(null);
 			}
 		}
 	}
@@ -267,7 +268,10 @@
 	protected void setSharedLibDependency(boolean enable) {
 		if (enable) {
 			DependenciesType deptype = getDependenciesType(true);
-			ArtifactType sharedLib = V20DeploymentPlanCreationOperation.createDependencyType("org.apache.geronimo.configs", "sharedlib", null, "car");
+			DependencyType sharedLib = getDeploymentObjectFactory().createDependencyType();
+			sharedLib.setGroupId("org.apache.geronimo.configs");
+			sharedLib.setArtifactId("sharedlib");
+			sharedLib.setType("car");
 			deptype.getDependency().add(sharedLib);
 		} else {
 			DependenciesType deptype = getDependenciesType(false);
@@ -294,10 +298,10 @@
 	}
 
 	private EnvironmentType getEnvironmentType(boolean create) {
-		EnvironmentType type = (EnvironmentType) getPlan().eGet(getEnvironmentEReference());
+		EnvironmentType type = ((WebAppType) getPlan().getValue()).getEnvironment();
 		if (type == null && create) {
-			type = DeploymentFactory.eINSTANCE.createEnvironmentType();
-			getPlan().eSet(getEnvironmentEReference(), type);
+			type = getDeploymentObjectFactory().createEnvironmentType();
+			((WebAppType) getPlan().getValue()).setEnvironment( type );
 		}
 		return type;
 	}
@@ -307,7 +311,7 @@
 		if(env != null) {
 			DependenciesType dep = env.getDependencies();
 			if (dep == null && create) {
-				dep = DeploymentFactory.eINSTANCE.createDependenciesType();
+				dep = getDeploymentObjectFactory().createDependenciesType();
 				env.setDependencies(dep);
 			}
 			return dep;
@@ -320,7 +324,7 @@
 		if (type != null) {
 			ArtifactType moduleId = type.getModuleId();
 			if (moduleId == null && create) {
-				moduleId = DeploymentFactory.eINSTANCE.createArtifactType();
+				moduleId = getDeploymentObjectFactory().createArtifactType();
 				type.setModuleId(moduleId);
 			}
 			return moduleId;
@@ -328,6 +332,14 @@
 		return null;
 	}
 
-	protected abstract EReference getEnvironmentEReference();
+	org.apache.geronimo.xml.ns.deployment_1.ObjectFactory deploymentObjectFacotry = null;
+	private org.apache.geronimo.xml.ns.deployment_1.ObjectFactory getDeploymentObjectFactory() {
+		if ( deploymentObjectFacotry == null ) {
+			deploymentObjectFacotry = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
+		}
+		return deploymentObjectFacotry;
+	}
+
+//	protected abstract JAXBElement getEnvironmentEReference();
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ConnectorGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ConnectorGeneralSection.java?rev=636035&r1=636034&r2=636035&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ConnectorGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/sections/ConnectorGeneralSection.java Tue Mar 11 10:53:06 2008
@@ -16,10 +16,9 @@
  */
 package org.apache.geronimo.st.v20.ui.sections;
 
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.xml.ns.j2ee.connector_1.ConnectorType;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
@@ -27,13 +26,13 @@
 
 	ConnectorType plan;
 
-	public ConnectorGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
+	public ConnectorGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
 		super(parent, toolkit, style, plan);
-		this.plan = (ConnectorType) plan;
+		this.plan = (ConnectorType) plan.getValue();
 		createClient();
 	}
 
-	protected EReference getEnvironmentEReference() {
-		return ConnectorPackage.eINSTANCE.getConnectorType_Environment();
+	protected JAXBElement getEnvironmentEReference() {
+		return null;//ConnectorPackage.eINSTANCE.getConnectorType_Environment();
 	}
 }



Mime
View raw message