geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Matt Hogstrom <m...@hogstrom.org>
Subject Re: [Vote: RTC] needed for eclipse plugin
Date Thu, 01 Jun 2006 17:46:57 GMT
Sachin

I looked at the patch.  A cosmetic comment is that these appear to mostly be new code but the 
copyright says 2004, 2005.  IANAL but I think the copyright should be updated to teh year that new 
code is added.  Perhaps someone more knowledgeable than I can comment.

I am not currently running Eclipse so I can't test the change but based on the code below I see no 
reason not to proceed.

+1

Matt

Sachin Patel wrote:
> The following big change is part 1 of 2 to correctly handle loading of 
> the deployment plan editors.  To briefly summarize, the change 
> introduces a new extension point which requires an implementation of 
> IGeronimoFormContentLoader.  Previously the editor extension point 
> loaded the editor for 1.0 plans.  Now the editor must handle multiple 
> versions of the deployment plans so now there is a single editor 
> extension def which loads a single editor impl, SharedDeploymentEditor 
> which loads all the IGeronimoFormContent loaders (one impl for 1.0 and 
> another for 1.1) and delegates to the appropriate emf models to generate 
> the UI for the plans.  With this commit, the 1.0 plans load correctly 
> and there is some work still need to be done for 1.1 to be done.  There 
> is currently some duplicate code which will need to be refactored, part 
> 2 will address this, but since the patch is about 3000 lines I wanted to 
> go ahead and commit.
> 
> Please vote...
> 
> Thanks.
> 
> 
> ------------------------------------------------------------------------
> 
> Index: plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
> ===================================================================
> --- plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF	(revision 410271)
> +++ plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF	(working copy)
> @@ -24,7 +24,8 @@
>   org.eclipse.wst.server.ui,
>   org.eclipse.core.commands,
>   org.eclipse.jst.server.generic.ui,
> - org.eclipse.jst.server.core
> + org.eclipse.jst.server.core,
> + org.eclipse.wst.common.project.facet.core
>  Eclipse-AutoStart: true
>  Export-Package: org.apache.geronimo.st.ui,
>   org.apache.geronimo.st.ui.actions,
> Index: plugins/org.apache.geronimo.st.ui/schema/loader.exsd
> ===================================================================
> --- plugins/org.apache.geronimo.st.ui/schema/loader.exsd	(revision 0)
> +++ plugins/org.apache.geronimo.st.ui/schema/loader.exsd	(revision 0)
> @@ -0,0 +1,109 @@
> +<?xml version='1.0' encoding='UTF-8'?>
> +<!-- Schema file written by PDE -->
> +<schema targetNamespace="org.apache.geronimo.st.ui">
> +<annotation>
> +      <appInfo>
> +         <meta.schema plugin="org.apache.geronimo.st.ui" id="loader" name="Geronimo Deployment Plan Loader"/>
> +      </appInfo>
> +      <documentation>
> +         This extension point allows loading of geronimo deployment plan form content for a given version of the runtime.
> +      </documentation>
> +   </annotation>
> +
> +   <element name="extension">
> +      <complexType>
> +         <sequence>
> +            <element ref="loader" minOccurs="1" maxOccurs="unbounded"/>
> +         </sequence>
> +         <attribute name="point" type="string" use="required">
> +            <annotation>
> +               <documentation>
> +                  
> +               </documentation>
> +            </annotation>
> +         </attribute>
> +         <attribute name="id" type="string">
> +            <annotation>
> +               <documentation>
> +                  
> +               </documentation>
> +            </annotation>
> +         </attribute>
> +         <attribute name="name" type="string">
> +            <annotation>
> +               <documentation>
> +                  
> +               </documentation>
> +               <appInfo>
> +                  <meta.attribute translatable="true"/>
> +               </appInfo>
> +            </annotation>
> +         </attribute>
> +      </complexType>
> +   </element>
> +
> +   <element name="loader">
> +      <complexType>
> +         <attribute name="class" type="string" use="required">
> +            <annotation>
> +               <documentation>
> +                  class element must implement org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader
> +               </documentation>
> +            </annotation>
> +         </attribute>
> +         <attribute name="version" type="string" use="required">
> +            <annotation>
> +               <documentation>
> +                  should match an appropriate Geronimo runtime version type
> +               </documentation>
> +            </annotation>
> +         </attribute>
> +      </complexType>
> +   </element>
> +
> +   <annotation>
> +      <appInfo>
> +         <meta.section type="since"/>
> +      </appInfo>
> +      <documentation>
> +         [Enter the first release in which this extension point appears.]
> +      </documentation>
> +   </annotation>
> +
> +   <annotation>
> +      <appInfo>
> +         <meta.section type="examples"/>
> +      </appInfo>
> +      <documentation>
> +         [Enter extension point usage example here.]
> +      </documentation>
> +   </annotation>
> +
> +   <annotation>
> +      <appInfo>
> +         <meta.section type="apiInfo"/>
> +      </appInfo>
> +      <documentation>
> +         [Enter API information here.]
> +      </documentation>
> +   </annotation>
> +
> +   <annotation>
> +      <appInfo>
> +         <meta.section type="implementation"/>
> +      </appInfo>
> +      <documentation>
> +         [Enter information about supplied implementation of this extension point.]
> +      </documentation>
> +   </annotation>
> +
> +   <annotation>
> +      <appInfo>
> +         <meta.section type="copyright"/>
> +      </appInfo>
> +      <documentation>
> +         
> +      </documentation>
> +   </annotation>
> +
> +</schema>
> Index: plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java	(revision 0)
> @@ -0,0 +1,52 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.ui.editors;
> +
> +import org.apache.geronimo.st.core.GeronimoUtils;
> +import org.eclipse.ui.IEditorInput;
> +import org.eclipse.ui.IFileEditorInput;
> +import org.eclipse.ui.PartInitException;
> +import org.eclipse.ui.forms.editor.FormEditor;
> +
> +public abstract class AbstractGeronimoFormContentLoader implements IGeronimoFormContentLoader {
> +
> +	/* (non-Javadoc)
> +	 * @see org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader#doAddPages(org.eclipse.ui.forms.editor.FormEditor)
> +	 */
> +	public void doAddPages(FormEditor editor) throws PartInitException{
> +		IEditorInput input = editor.getEditorInput();
> +		if(input instanceof IFileEditorInput) {
> +			String planFileName = ((IFileEditorInput) input).getFile().getName();
> +			if(GeronimoUtils.WEB_PLAN_NAME.equals(planFileName)) {
> +				addWebPlanPages(editor);
> +			} else if(GeronimoUtils.OPENEJB_PLAN_NAME.equals(planFileName)) {
> +				addOpenEjbPlanPages(editor);
> +			} else if(GeronimoUtils.CONNECTOR_PLAN_NAME.equals(planFileName)) {
> +				addConnectorPlanPages(editor);
> +			} else if(GeronimoUtils.APP_PLAN_NAME.equals(planFileName)) {
> +				addApplicationPlanPages(editor);
> +			}
> +		}
> +	}
> +	
> +	abstract public void addWebPlanPages(FormEditor editor) throws PartInitException;
> +	
> +	abstract public void addOpenEjbPlanPages(FormEditor editor) throws PartInitException;
> +	
> +	abstract public void addConnectorPlanPages(FormEditor editor) throws PartInitException;
> +	
> +	abstract public void addApplicationPlanPages(FormEditor editor) throws PartInitException;
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java	(revision 0)
> @@ -0,0 +1,103 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.ui.editors;
> +
> +import java.util.HashMap;
> +import java.util.Map;
> +
> +import org.apache.geronimo.st.ui.Activator;
> +import org.eclipse.core.resources.IFile;
> +import org.eclipse.core.resources.IProject;
> +import org.eclipse.core.runtime.CoreException;
> +import org.eclipse.core.runtime.IConfigurationElement;
> +import org.eclipse.core.runtime.IExtensionRegistry;
> +import org.eclipse.core.runtime.Platform;
> +import org.eclipse.emf.ecore.EObject;
> +import org.eclipse.jst.server.core.FacetUtil;
> +import org.eclipse.ui.IEditorInput;
> +import org.eclipse.ui.IFileEditorInput;
> +import org.eclipse.ui.PartInitException;
> +import org.eclipse.wst.common.project.facet.core.IFacetedProject;
> +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
> +import org.eclipse.wst.server.core.IRuntime;
> +
> +public class SharedDeploymentPlanEditor extends AbstractGeronimoDeploymentPlanEditor {
> +
> +	private static Map loaders = new HashMap();
> +
> +	private IGeronimoFormContentLoader currentLoader = null;
> +
> +	static {
> +		loadExtensionPoints();
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
> +	 */
> +	public void doAddPages() throws PartInitException {
> +		if (getDeploymentPlan() != null && getLoader() != null) {
> +			currentLoader.doAddPages(this);
> +		}
> +	}
> +
> +	private static synchronized void loadExtensionPoints() {
> +		IExtensionRegistry registry = Platform.getExtensionRegistry();
> +		IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "loader");
> +		for (int i = 0; i < cf.length; i++) {
> +			IConfigurationElement element = cf[i];
> +			if ("loader".equals(element.getName())) {
> +				try {
> +					IGeronimoFormContentLoader loader = (IGeronimoFormContentLoader) element.createExecutableExtension("class");
> +					String version = element.getAttribute("version");
> +					loaders.put(version, loader);
> +				} catch (CoreException e) {
> +					e.printStackTrace();
> +				}
> +			}
> +		}
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
> +	 */
> +	public EObject loadDeploymentPlan(IFile file) {
> +		return getLoader() != null ? currentLoader.loadDeploymentPlan(file)
> +				: null;
> +	}
> +
> +	private IGeronimoFormContentLoader getLoader() {
> +		if (currentLoader == null) {
> +			IEditorInput input = getEditorInput();
> +			if (input instanceof IFileEditorInput) {
> +				IProject project = ((IFileEditorInput) input).getFile().getProject();
> +				try {
> +					IFacetedProject fp = ProjectFacetsManager.create(project);
> +					IRuntime runtime = FacetUtil.getRuntime(fp.getRuntime());
> +					String version = runtime.getRuntimeType().getVersion();
> +					currentLoader = (IGeronimoFormContentLoader) loaders.get(version);
> +				} catch (CoreException e) {
> +					e.printStackTrace();
> +				}
> +			}
> +		}
> +		return currentLoader;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java	(revision 0)
> @@ -0,0 +1,29 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.ui.editors;
> +
> +import org.eclipse.core.resources.IFile;
> +import org.eclipse.emf.ecore.EObject;
> +import org.eclipse.ui.PartInitException;
> +import org.eclipse.ui.forms.editor.FormEditor;
> +
> +public interface IGeronimoFormContentLoader {
> +	
> +	public EObject loadDeploymentPlan(IFile file);
> +	
> +	public void doAddPages(FormEditor editor) throws PartInitException;
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.ui/plugin.properties
> ===================================================================
> --- plugins/org.apache.geronimo.st.ui/plugin.properties	(revision 410271)
> +++ plugins/org.apache.geronimo.st.ui/plugin.properties	(working copy)
> @@ -1,4 +1,5 @@
>  pluginName=Geronimo Server Tools UI
>  providerName=Apache Software Foundation
>  
> -PopupMenus.launchconsole=Launch Geronimo Console
> \ No newline at end of file
> +PopupMenus.launchconsole=Launch Geronimo Console
> +deploymentPlanEditorName=Geronimo Deployment Plan Editor
> \ No newline at end of file
> Index: plugins/org.apache.geronimo.st.ui/plugin.xml
> ===================================================================
> --- plugins/org.apache.geronimo.st.ui/plugin.xml	(revision 410271)
> +++ plugins/org.apache.geronimo.st.ui/plugin.xml	(working copy)
> @@ -2,6 +2,8 @@
>  <?eclipse version="3.0"?>
>  <plugin>
>  
> + 	<extension-point id="loader" name="Geronimo Deployment Plan Loader" schema="schema/loader.exsd"/>
> +
>      <extension point="org.eclipse.wst.server.ui.wizardFragments">
>          <fragment id="org.eclipse.jst.server.generic.runtime"
>              typeIds="org.apache.geronimo.generic.runtime.10"
> @@ -52,5 +54,15 @@
>          </section>
>      </extension>
>      
> +    <extension point="org.eclipse.ui.editors">
> +        <editor class="org.apache.geronimo.st.ui.editors.SharedDeploymentPlanEditor"
> +            default="true" 
> +            filenames="geronimo-web.xml,geronimo-application.xml,openejb-jar.xml,geronimo-connector.xml"
> +            icon="icons/obj16/littleG.gif"
> +            id="org.apache.geronimo.ui.editors.WebEditor" 
> +            name="%deploymentPlanEditorName">
> +        </editor>
> +    </extension>
> +    
>  </plugin>
>   
> \ No newline at end of file
> Index: plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF	(revision 410389)
> +++ plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF	(working copy)
> @@ -18,5 +18,8 @@
>   org.eclipse.ui.forms,
>   org.apache.geronimo.st.core,
>   org.eclipse.core.resources,
> - org.eclipse.wst.common.modulecore
> + org.eclipse.wst.common.modulecore,
> + org.eclipse.emf.ecore,
> + org.apache.geronimo.v11.deployment.model.edit,
> + org.apache.geronimo.v11.deployment.model
>  Eclipse-AutoStart: true
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java	(revision 0)
> @@ -0,0 +1,38 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.pages;
> +
> +import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
> +import org.apache.geronimo.st.v11.ui.sections.OpenEjbJarGeneralSection;
> +import org.eclipse.ui.forms.IManagedForm;
> +import org.eclipse.ui.forms.editor.FormEditor;
> +
> +public class EjbOverviewPage extends AbstractGeronimoFormPage {
> +
> +	public EjbOverviewPage(FormEditor editor, String id, String title) {
> +		super(editor, id, title);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
> +	 */
> +	protected void fillBody(IManagedForm managedForm) {
> +		managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/EjbOverviewPage.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java	(revision 0)
> @@ -0,0 +1,51 @@
> +package org.apache.geronimo.st.v11.ui.pages;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
> +import org.apache.geronimo.st.v11.ui.sections.SecurityRootSection;
> +import org.apache.geronimo.st.v11.ui.sections.SecuritySection;
> +import org.eclipse.emf.ecore.EReference;
> +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 SecurityPage(FormEditor editor, String id, String title, EReference securityERef) {
> +		super(editor, id, title);
> +		this.securityERef = securityERef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @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));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getLayout()
> +	 */
> +	protected GridLayout getLayout() {
> +		GridLayout layout = super.getLayout();
> +		layout.numColumns = 1;
> +		return layout;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
> +	 */
> +	public String getFormTitle() {
> +		return CommonMessages.securityPageTitle;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/SecurityPage.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java	(revision 0)
> @@ -0,0 +1,47 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.pages;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
> +import org.apache.geronimo.st.v11.ui.sections.WebGeneralSection;
> +import org.eclipse.ui.forms.IManagedForm;
> +import org.eclipse.ui.forms.editor.FormEditor;
> +
> +public class WebGeneralPage extends AbstractGeronimoFormPage {
> +
> +	public WebGeneralPage(FormEditor editor, String id, String title) {
> +		super(editor, id, title);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
> +	 */
> +	protected void fillBody(IManagedForm managedForm) {
> +		managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
> +	 */
> +	public String getFormTitle() {
> +		return CommonMessages.webGeneralPageTitle;
> +	}
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/WebGeneralPage.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java	(revision 0)
> @@ -0,0 +1,71 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.pages;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
> +import org.apache.geronimo.st.v11.ui.sections.EjbLocalRefSection;
> +import org.apache.geronimo.st.v11.ui.sections.EjbRefSection;
> +import org.apache.geronimo.st.v11.ui.sections.GBeanRefSection;
> +import org.apache.geronimo.st.v11.ui.sections.ResourceEnvRefSection;
> +import org.apache.geronimo.st.v11.ui.sections.ResourceRefSection;
> +import org.apache.geronimo.st.v11.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 EReference resEnvRef;
> +
> +	public EReference ejbRef;
> +
> +	public EReference ejbLocalRef;
> +
> +	public EReference gbeanRef;
> +
> +	public EReference serviceRef;
> +
> +	public NamingFormPage(FormEditor editor, String id, String title) {
> +		super(editor, id, title);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
> +	 */
> +	protected void fillBody(IManagedForm managedForm) {
> +		managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resRef));
> +		managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resEnvRef));
> +		managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbRef));
> +		managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbLocalRef));
> +		managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), gbeanRef));
> +		managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), serviceRef));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
> +	 */
> +	public String getFormTitle() {
> +		return CommonMessages.namingFormPageTitle;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java	(revision 0)
> @@ -0,0 +1,48 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.pages;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
> +import org.apache.geronimo.st.v11.ui.sections.AppGeneralSection;
> +import org.eclipse.ui.forms.IManagedForm;
> +import org.eclipse.ui.forms.editor.FormEditor;
> +
> +public class AppGeneralPage extends AbstractGeronimoFormPage {
> +
> +	public AppGeneralPage(FormEditor editor, String id, String title) {
> +		super(editor, id, title);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
> +	 */
> +	protected void fillBody(IManagedForm managedForm) {
> +		managedForm.addPart(new AppGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
> +	 */
> +	public String getFormTitle() {
> +		return CommonMessages.appGeneralPageTitle;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/AppGeneralPage.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java	(revision 0)
> @@ -0,0 +1,59 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.pages;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
> +import org.apache.geronimo.st.v11.ui.sections.DependencySection;
> +import org.apache.geronimo.st.v11.ui.sections.GBeanSection;
> +import org.apache.geronimo.st.v11.ui.sections.ImportSection;
> +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 dependencies;
> +
> +	public EReference imports;
> +
> +	public EReference gbeans;
> +
> +	public DeploymentPage(FormEditor editor, String id, String title) {
> +		super(editor, id, title);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
> +	 */
> +	protected void fillBody(IManagedForm managedForm) {
> +		managedForm.addPart(new DependencySection(getDeploymentPlan(), dependencies, body, toolkit, getStyle()));
> +		managedForm.addPart(new ImportSection(getDeploymentPlan(), imports, body, toolkit, getStyle()));
> +		managedForm.addPart(new GBeanSection(getDeploymentPlan(), gbeans, body, toolkit, getStyle()));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
> +	 */
> +	public String getFormTitle() {
> +		return CommonMessages.deploymentPageTitle;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/ConnectorOverviewPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/ConnectorOverviewPage.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/ConnectorOverviewPage.java	(revision 0)
> @@ -0,0 +1,48 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.pages;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
> +import org.apache.geronimo.st.v11.ui.sections.ConnectorGeneralSection;
> +import org.eclipse.ui.forms.IManagedForm;
> +import org.eclipse.ui.forms.editor.FormEditor;
> +
> +public class ConnectorOverviewPage extends AbstractGeronimoFormPage {
> +
> +	public ConnectorOverviewPage(FormEditor editor, String id, String title) {
> +		super(editor, id, title);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
> +	 */
> +	protected void fillBody(IManagedForm managedForm) {
> +		managedForm.addPart(new ConnectorGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
> +	 */
> +	public String getFormTitle() {
> +		return CommonMessages.connectorOverViewPageTitle;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/pages/ConnectorOverviewPage.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java	(revision 0)
> @@ -0,0 +1,213 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.deployment.ArtifactType;
> +import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
> +import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +import org.eclipse.jface.resource.ImageDescriptor;
> +import org.eclipse.jface.wizard.IWizardPage;
> +import org.eclipse.jface.wizard.WizardPage;
> +import org.eclipse.swt.SWT;
> +import org.eclipse.swt.layout.GridData;
> +import org.eclipse.swt.layout.GridLayout;
> +import org.eclipse.swt.widgets.Composite;
> +import org.eclipse.swt.widgets.Group;
> +import org.eclipse.swt.widgets.Label;
> +import org.eclipse.swt.widgets.Text;
> +
> +public class DependencyWizard extends AbstractTableWizard {
> +
> +	public static String wizardNewTitle_Dependency;
> +
> +	public static String wizardEditTitle_Dependency;
> +
> +	public static String wizardPageTitle_Dependency;
> +
> +	public static String wizardPageDescription_Dependency;
> +
> +	protected Label groupIdLabel;
> +
> +	protected Label artifactIdLabel;
> +
> +	protected Label versionLabel;
> +
> +	protected Text groupIdText;
> +
> +	protected Text artifactIdText;
> +
> +	protected Text versionText;
> +
> +	/**
> +	 * @param section
> +	 */
> +	public DependencyWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEFactory()
> +	 */
> +	public EFactory getEFactory() {
> +		return DeploymentFactory.eINSTANCE;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getTableColumnEAttributes()
> +	 */
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] {};
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_Dependency;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_Dependency;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_Dependency;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_Dependency;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.AbstractTableWizard#processEAttributes(org.eclipse.jface.wizard.IWizardPage)
> +	 */
> +	public void processEAttributes(IWizardPage page) {
> +		ArtifactType dt = (ArtifactType) eObject;
> +		dt.setArtifactId(artifactIdText.getText());
> +		dt.setGroupId(groupIdText.getText());
> +		dt.setVersion(versionText.getText());
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.eclipse.jface.wizard.IWizard#addPages()
> +	 */
> +	public void addPages() {
> +		WizardPage page = new DependencyWizardPage("Page0");
> +		addPage(page);
> +	}
> +
> +	public class DependencyWizardPage extends WizardPage {
> +
> +		public DependencyWizardPage(String pageName) {
> +			super(pageName);
> +			setTitle(getWizardFirstPageTitle());
> +			setDescription(getWizardFirstPageDescription());
> +		}
> +
> +		public DependencyWizardPage(String pageName, String title, ImageDescriptor titleImage) {
> +			super(pageName, title, titleImage);
> +		}
> +
> +		public void createControl(Composite parent) {
> +			Composite composite = new Composite(parent, SWT.NULL);
> +
> +			GridLayout layout = new GridLayout();
> +			layout.numColumns = 2;
> +			layout.horizontalSpacing = 15;
> +			composite.setLayout(layout);
> +			composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
> +
> +			GridData data = new GridData();
> +			data = new GridData(GridData.FILL_HORIZONTAL);
> +			data.horizontalSpan = 2;
> +
> +			Group group = new Group(composite, SWT.NONE);
> +			group.setText(CommonMessages.dependencyGroupLabel);
> +			group.setLayoutData(data);
> +			group.setLayout(layout);
> +
> +			groupIdLabel = new Label(group, SWT.LEFT);
> +			groupIdLabel.setText(CommonMessages.groupId);
> +			groupIdLabel.setLayoutData(createLabelGridData());
> +
> +			groupIdText = new Text(group, SWT.SINGLE | SWT.BORDER);
> +			groupIdText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> +
> +			artifactIdLabel = new Label(group, SWT.LEFT);
> +			artifactIdLabel.setText(CommonMessages.artifactId);
> +			artifactIdLabel.setLayoutData(createLabelGridData());
> +
> +			artifactIdText = new Text(group, SWT.SINGLE | SWT.BORDER);
> +			artifactIdText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> +
> +			versionLabel = new Label(group, SWT.LEFT);
> +			versionLabel.setText(CommonMessages.version);
> +			versionLabel.setLayoutData(createLabelGridData());
> +
> +			versionText = new Text(group, SWT.SINGLE | SWT.BORDER);
> +			versionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> +
> +			if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId())) {
> +				artifactIdText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_ArtifactId()).toString());
> +			}
> +			if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_GroupId())) {
> +				groupIdText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_GroupId()).toString());
> +			}
> +			if (eObject.eIsSet(DeploymentPackage.eINSTANCE.getArtifactType_Version())) {
> +				versionText.setText(eObject.eGet(DeploymentPackage.eINSTANCE.getArtifactType_Version()).toString());
> +			}
> +
> +			setControl(composite);
> +
> +		}
> +	}
> +
> +	public GridData createLabelGridData() {
> +		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
> +		gd.horizontalIndent = 20;
> +		return gd;
> +	}
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/DependencyWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java	(revision 0)
> @@ -0,0 +1,81 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.naming.NamingFactory;
> +import org.apache.geronimo.xml.ns.naming.NamingPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +
> +public class ResourceRefWizard extends AbstractTableWizard {
> +
> +	/**
> +	 * @param section
> +	 */
> +	public ResourceRefWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	public EFactory getEFactory() {
> +		return NamingFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] {
> +				NamingPackage.eINSTANCE.getResourceRefType_RefName(),
> +				NamingPackage.eINSTANCE.getResourceRefType_ResourceLink() };
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardPageTitle_ResRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_ResRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_ResRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_ResRef;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceRefWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java	(revision 0)
> @@ -0,0 +1,78 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.naming.NamingFactory;
> +import org.apache.geronimo.xml.ns.naming.NamingPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +
> +public class EjbLocalRefWizard extends AbstractTableWizard {
> +
> +	public EjbLocalRefWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_EjbLocalRef;
> +	}
> +
> +	public EFactory getEFactory() {
> +		return NamingFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] {
> +				NamingPackage.eINSTANCE.getEjbLocalRefType_RefName(),
> +				NamingPackage.eINSTANCE.getEjbLocalRefType_EjbLink() };
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_EjbLocalRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_EjbLocalRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_EjbLocalRef;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbLocalRefWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java	(revision 0)
> @@ -0,0 +1,79 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.naming.NamingFactory;
> +import org.apache.geronimo.xml.ns.naming.NamingPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +
> +public class GBeanRefWizard extends AbstractTableWizard {
> +
> +	public GBeanRefWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	public EFactory getEFactory() {
> +		return NamingFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] {
> +				NamingPackage.eINSTANCE.getGbeanRefType_RefName(),
> +				NamingPackage.eINSTANCE.getGbeanRefType_RefType(),
> +				NamingPackage.eINSTANCE.getGbeanRefType_ProxyType() };
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_GBeanRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_GBeanRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_GBeanRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_GBeanRef;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanRefWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleWizard.java	(revision 0)
> @@ -0,0 +1,160 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.ui.sections.SecuritySection;
> +import org.apache.geronimo.xml.ns.security.DescriptionType;
> +import org.apache.geronimo.xml.ns.security.RoleMappingsType;
> +import org.apache.geronimo.xml.ns.security.RoleType;
> +import org.apache.geronimo.xml.ns.security.SecurityFactory;
> +import org.apache.geronimo.xml.ns.security.SecurityPackage;
> +import org.apache.geronimo.xml.ns.security.SecurityType;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +import org.eclipse.emf.ecore.EObject;
> +import org.eclipse.swt.SWT;
> +import org.eclipse.swt.layout.GridData;
> +import org.eclipse.swt.widgets.Composite;
> +import org.eclipse.swt.widgets.Label;
> +import org.eclipse.swt.widgets.Text;
> +
> +public class SecurityRoleWizard extends AbstractTableWizard {
> +
> +	public SecurityRoleWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	public EFactory getEFactory() {
> +		return SecurityFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] { SecurityPackage.eINSTANCE.getRoleType_RoleName() };
> +	}
> +
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_SecurityRole;
> +	}
> +
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_SecurityRole;
> +	}
> +
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_SecurityRole;
> +	}
> +
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_SecurityRole;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.eclipse.jface.wizard.IWizard#addPages()
> +	 */
> +	public void addPages() {
> +		SecurityRoleWizardPage page = new SecurityRoleWizardPage("Page0");
> +		page.setImageDescriptor(descriptor);
> +		addPage(page);
> +	}
> +
> +	public class SecurityRoleWizardPage extends DynamicWizardPage {
> +
> +		Text descriptionText;
> +
> +		public SecurityRoleWizardPage(String pageName) {
> +			super(pageName);
> +		}
> +
> +		/*
> +		 * (non-Javadoc)
> +		 * 
> +		 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard.DynamicWizardPage#doCustom()
> +		 */
> +		public void doCustom(Composite parent) {
> +			Label label = new Label(parent, SWT.LEFT);
> +			String columnName = CommonMessages.description;
> +			if (!columnName.endsWith(":"))
> +				columnName = columnName.concat(":");
> +			label.setText(columnName);
> +			GridData data = new GridData();
> +			data.horizontalAlignment = GridData.FILL;
> +			label.setLayoutData(data);
> +
> +			descriptionText = new Text(parent, SWT.SINGLE | SWT.BORDER);
> +			data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
> +					| GridData.VERTICAL_ALIGN_FILL);
> +			data.grabExcessHorizontalSpace = true;
> +			data.widthHint = 100;
> +			descriptionText.setLayoutData(data);
> +
> +			if (eObject != null && eObject instanceof RoleType) {
> +				RoleType roleType = (RoleType) eObject;
> +				if (!roleType.getDescription().isEmpty()) {
> +					DescriptionType desc = (DescriptionType) roleType.getDescription().get(0);
> +					if (desc.eIsSet(SecurityPackage.eINSTANCE.getDescriptionType_Value())) {
> +						descriptionText.setText(desc.getValue());
> +					}
> +				}
> +			}
> +		}
> +	}
> +
> +	public boolean performFinish() {
> +		SecurityRoleWizardPage page = (SecurityRoleWizardPage) getPages()[0];
> +
> +		if (eObject == null) {
> +			eObject = getEFactory().create(getTableColumnEAttributes()[0].getEContainingClass());
> +			EObject plan = section.getPlan();
> +
> +			SecurityType securityType = (SecurityType) plan.eGet(((SecuritySection) section).securityERef);
> +			if (securityType == null) {
> +				securityType = SecurityFactory.eINSTANCE.createSecurityType();
> +				plan.eSet(((SecuritySection) section).securityERef, securityType);
> +			}
> +
> +			RoleMappingsType roleMappingsType = securityType.getRoleMappings();
> +			if (roleMappingsType == null) {
> +				roleMappingsType = SecurityFactory.eINSTANCE.createRoleMappingsType();
> +				securityType.setRoleMappings(roleMappingsType);
> +			}
> +
> +			roleMappingsType.getRole().add(eObject);
> +		}
> +
> +		processEAttributes(page);
> +
> +		DescriptionType type = null;
> +		RoleType roleType = ((RoleType) eObject);
> +		if (roleType.getDescription().isEmpty()) {
> +			type = SecurityFactory.eINSTANCE.createDescriptionType();
> +			roleType.getDescription().add(type);
> +		} else {
> +			type = (DescriptionType) roleType.getDescription().get(0);
> +		}
> +		type.setValue(page.descriptionText.getText());
> +
> +		if (section.getTableViewer().getInput() == section.getPlan()) {
> +			section.getTableViewer().setInput(section.getInput());
> +		}
> +
> +		return true;
> +	}
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/SecurityRoleWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ImportWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ImportWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ImportWizard.java	(revision 0)
> @@ -0,0 +1,66 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.sections.AbstractTableSection;
> +
> +public class ImportWizard extends DependencyWizard {
> +
> +	/**
> +	 * @param section
> +	 */
> +	public ImportWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_Import;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_Import;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_Import;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_Import;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ImportWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java	(revision 0)
> @@ -0,0 +1,81 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.deployment.DeploymentFactory;
> +import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +
> +public class GBeanWizard extends AbstractTableWizard {
> +
> +	/**
> +	 * @param section
> +	 */
> +	public GBeanWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	public EFactory getEFactory() {
> +		return DeploymentFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] {
> +				DeploymentPackage.eINSTANCE.getGbeanType_Name(),
> +				DeploymentPackage.eINSTANCE.getGbeanType_Class() };
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_GBean;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_GBean;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardEditTitle_GBean;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageTitle_GBean;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/GBeanWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java	(revision 0)
> @@ -0,0 +1,78 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.naming.NamingFactory;
> +import org.apache.geronimo.xml.ns.naming.NamingPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +
> +public class EjbRefWizard extends AbstractTableWizard {
> +
> +	public EjbRefWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	public EFactory getEFactory() {
> +		return NamingFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] {
> +				NamingPackage.eINSTANCE.getEjbRefType_RefName(),
> +				NamingPackage.eINSTANCE.getEjbRefType_EjbLink() };
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_EjbRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_EjbRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_EjbRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_EjbRef;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/EjbRefWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java	(revision 0)
> @@ -0,0 +1,81 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.naming.NamingFactory;
> +import org.apache.geronimo.xml.ns.naming.NamingPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +
> +public class ResourceEnvRefWizard extends AbstractTableWizard {
> +
> +	/**
> +	 * @param section
> +	 */
> +	public ResourceEnvRefWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	public EFactory getEFactory() {
> +		return NamingFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] {
> +				NamingPackage.eINSTANCE.getResourceEnvRefType_RefName(),
> +				NamingPackage.eINSTANCE.getResourceEnvRefType_MessageDestinationLink() };
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardPageTitle_ResEnvRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_ResEnvRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_ResEnvRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_ResEnvRef;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ResourceEnvRefWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java	(revision 0)
> @@ -0,0 +1,79 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.wizards;
> +
> +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.xml.ns.naming.NamingFactory;
> +import org.apache.geronimo.xml.ns.naming.NamingPackage;
> +import org.eclipse.emf.ecore.EAttribute;
> +import org.eclipse.emf.ecore.EFactory;
> +
> +public class ServiceRefWizard extends AbstractTableWizard {
> +
> +	/**
> +	 * @param section
> +	 */
> +	public ServiceRefWizard(AbstractTableSection section) {
> +		super(section);
> +	}
> +
> +	public EFactory getEFactory() {
> +		return NamingFactory.eINSTANCE;
> +	}
> +
> +	public EAttribute[] getTableColumnEAttributes() {
> +		return new EAttribute[] { NamingPackage.eINSTANCE.getServiceRefType_ServiceRefName() };
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
> +	 */
> +	public String getAddWizardWindowTitle() {
> +		return CommonMessages.wizardNewTitle_ServiceRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
> +	 */
> +	public String getEditWizardWindowTitle() {
> +		return CommonMessages.wizardEditTitle_ServiceRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
> +	 */
> +	public String getWizardFirstPageTitle() {
> +		return CommonMessages.wizardPageTitle_ServiceRef;
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
> +	 */
> +	public String getWizardFirstPageDescription() {
> +		return CommonMessages.wizardPageDescription_ServiceRef;
> +	}
> +
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/ServiceRefWizard.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java	(revision 0)
> @@ -0,0 +1,148 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v11.ui.editors;
> +
> +import org.apache.geronimo.st.ui.CommonMessages;
> +import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;
> +import org.apache.geronimo.st.v11.core.GeronimoV11Utils;
> +import org.apache.geronimo.st.v11.ui.pages.AppGeneralPage;
> +import org.apache.geronimo.st.v11.ui.pages.ConnectorOverviewPage;
> +import org.apache.geronimo.st.v11.ui.pages.DeploymentPage;
> +import org.apache.geronimo.st.v11.ui.pages.EjbOverviewPage;
> +import org.apache.geronimo.st.v11.ui.pages.NamingFormPage;
> +import org.apache.geronimo.st.v11.ui.pages.SecurityPage;
> +import org.apache.geronimo.st.v11.ui.pages.WebGeneralPage;
> +import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
> +import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
> +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 {
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addApplicationPlanPages(org.eclipse.ui.forms.editor.FormEditor)
> +	 */
> +	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(getApplicationDeploymentPage(editor));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addConnectorPlanPages(org.eclipse.ui.forms.editor.FormEditor)
> +	 */
> +	public void addConnectorPlanPages(FormEditor editor) throws PartInitException {
> +		editor.addPage(new ConnectorOverviewPage(editor, "connectoroverview", CommonMessages.editorTabGeneral));
> +		editor.addPage(getConnectorDeploymentPage(editor));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addOpenEjbPlanPages()
> +	 */
> +	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(getEjbJarDeploymentPage(editor));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addWebPlanPages()
> +	 */
> +	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(getWebDeploymentPage(editor));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader#loadDeploymentPlan(org.eclipse.core.resources.IFile)
> +	 */
> +	public EObject loadDeploymentPlan(IFile file) {
> +		return GeronimoV11Utils.getWebDeploymentPlan(file);
> +	}
> +
> +	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();
> +		return formPage;
> +	}
> +
> +	protected FormPage getWebDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		formPage.gbeans = WebFactory.eINSTANCE.getWebPackage().getWebAppType_Gbean();
> +		return formPage;
> +	}
> +
> +	private FormPage getEjbJarDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		formPage.gbeans = JarFactory.eINSTANCE.getJarPackage().getOpenejbJarType_Gbean();
> +		return formPage;
> +	}
> +
> +	protected FormPage getApplicationDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		formPage.gbeans = ApplicationFactory.eINSTANCE.getApplicationPackage().getApplicationType_Gbean();
> +		return formPage;
> +	}
> +
> +	private FormPage getConnectorDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		formPage.gbeans = ConnectorFactory.eINSTANCE.getConnectorPackage().getConnectorType_Gbean();
> +		return formPage;
> +	}
> +
> +	// TODO push to superclass
> +	private NamingFormPage createNamingFormPage(FormEditor editor) {
> +		return new NamingFormPage(editor, "namingpage", CommonMessages.editorTabNaming);
> +	}
> +
> +	// TODO Push to superclass
> +	private DeploymentPage createDeploymentFormPage(FormEditor editor) {
> +		DeploymentPage formPage = new DeploymentPage(editor, "deploymentpage", CommonMessages.editorTabDeployment);
> +		DeploymentPackage pkg = DeploymentFactory.eINSTANCE.getDeploymentPackage();
> +		formPage.dependencies = pkg.getEnvironmentType_Dependencies();
> +		return formPage;
> +	}
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v11.ui/plugin.xml
> ===================================================================
> --- plugins/org.apache.geronimo.st.v11.ui/plugin.xml	(revision 410389)
> +++ plugins/org.apache.geronimo.st.v11.ui/plugin.xml	(working copy)
> @@ -8,4 +8,8 @@
>              class="org.apache.geronimo.st.v11.ui.sections.ServerEditorTestEnvSection">
>          </section>
>      </extension>
> +    
> +    <extension point="org.apache.geronimo.st.ui.loader">
> +    	<loader class="org.apache.geronimo.st.v11.ui.editors.GeronimoFormContentLoader" version="1.1"/>
> +    </extension>
>  </plugin>
> Index: plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF	(working copy)
> @@ -21,5 +21,6 @@
>   org.apache.geronimo.deployment.model,
>   org.apache.geronimo.st.core,
>   org.eclipse.core.resources,
> - org.eclipse.wst.common.modulecore
> + org.eclipse.wst.common.modulecore,
> + org.eclipse.ui.ide
>  Eclipse-AutoStart: true
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/EjbOverviewPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/EjbOverviewPage.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/EjbOverviewPage.java	(working copy)
> @@ -22,23 +22,10 @@
>  
>  public class EjbOverviewPage extends AbstractGeronimoFormPage {
>  
> -	/**
> -	 * @param editor
> -	 * @param id
> -	 * @param title
> -	 */
>  	public EjbOverviewPage(FormEditor editor, String id, String title) {
>  		super(editor, id, title);
>  	}
>  
> -	/**
> -	 * @param id
> -	 * @param title
> -	 */
> -	public EjbOverviewPage(String id, String title) {
> -		super(id, title);
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java	(working copy)
> @@ -13,16 +13,11 @@
>  
>  	public EReference securityERef;
>  
> -	public SecurityPage(FormEditor editor, String id, String title,
> -			EReference securityERef) {
> +	public SecurityPage(FormEditor editor, String id, String title, EReference securityERef) {
>  		super(editor, id, title);
>  		this.securityERef = securityERef;
>  	}
>  
> -	public SecurityPage(String id, String title) {
> -		super(id, title);
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java	(working copy)
> @@ -27,10 +27,6 @@
>  		super(editor, id, title);
>  	}
>  
> -	public WebGeneralPage(String id, String title) {
> -		super(id, title);
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java	(working copy)
> @@ -45,10 +45,6 @@
>  		super(editor, id, title);
>  	}
>  
> -	public NamingFormPage(String id, String title) {
> -		super(id, title);
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java	(working copy)
> @@ -23,23 +23,10 @@
>  
>  public class AppGeneralPage extends AbstractGeronimoFormPage {
>  
> -	/**
> -	 * @param editor
> -	 * @param id
> -	 * @param title
> -	 */
>  	public AppGeneralPage(FormEditor editor, String id, String title) {
>  		super(editor, id, title);
>  	}
>  
> -	/**
> -	 * @param id
> -	 * @param title
> -	 */
> -	public AppGeneralPage(String id, String title) {
> -		super(id, title);
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java	(working copy)
> @@ -41,14 +41,6 @@
>  		super(editor, id, title);
>  	}
>  
> -	/**
> -	 * @param id
> -	 * @param title
> -	 */
> -	public DeploymentPage(String id, String title) {
> -		super(id, title);
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java	(working copy)
> @@ -23,23 +23,10 @@
>  
>  public class ConnectorOverviewPage extends AbstractGeronimoFormPage {
>  
> -	/**
> -	 * @param editor
> -	 * @param id
> -	 * @param title
> -	 */
>  	public ConnectorOverviewPage(FormEditor editor, String id, String title) {
>  		super(editor, id, title);
>  	}
>  
> -	/**
> -	 * @param id
> -	 * @param title
> -	 */
> -	public ConnectorOverviewPage(String id, String title) {
> -		super(id, title);
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java	(working copy)
> @@ -25,8 +25,7 @@
>  
>  public class ImportSection extends DependencySection {
>  
> -	public ImportSection(EObject plan, EReference dependenciesERef,
> -			Composite parent, FormToolkit toolkit, int style) {
> +	public ImportSection(EObject plan, EReference dependenciesERef, Composite parent, FormToolkit toolkit, int style) {
>  		super(plan, dependenciesERef, parent, toolkit, style);
>  	}
>  
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/WebGeneralSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/WebGeneralSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/WebGeneralSection.java	(working copy)
> @@ -44,8 +44,7 @@
>  
>  	WebAppType plan;
>  
> -	public WebGeneralSection(Composite parent, FormToolkit toolkit, int style,
> -			EObject plan) {
> +	public WebGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
>  		super(parent, toolkit, style, plan);
>  		this.plan = (WebAppType) plan;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java	(working copy)
> @@ -59,8 +59,7 @@
>  	 * @param toolkit
>  	 * @param style
>  	 */
> -	public SecurityRootSection(Composite parent, FormToolkit toolkit,
> -			int style, EObject plan, EReference secERef) {
> +	public SecurityRootSection(Composite parent, FormToolkit toolkit, int style, EObject plan, EReference secERef) {
>  		super(parent, toolkit, style, plan);
>  		this.secERef = secERef;
>  		createClient();
> @@ -128,8 +127,7 @@
>  		return gd;
>  	}
>  
> -	protected Label createLabel(Composite parent, String text,
> -			FormToolkit toolkit) {
> +	protected Label createLabel(Composite parent, String text, FormToolkit toolkit) {
>  		Label label = toolkit.createLabel(parent, text);
>  		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
>  		label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java	(working copy)
> @@ -41,8 +41,7 @@
>  	 * @param toolkit
>  	 * @param style
>  	 */
> -	public GBeanSection(EObject plan, EReference gBeanERef, Composite parent,
> -			FormToolkit toolkit, int style) {
> +	public GBeanSection(EObject plan, EReference gBeanERef, Composite parent, FormToolkit toolkit, int style) {
>  		super(plan, parent, toolkit, style);
>  		this.gBeanERef = gBeanERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/OpenEjbJarGeneralSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/OpenEjbJarGeneralSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/OpenEjbJarGeneralSection.java	(working copy)
> @@ -26,17 +26,12 @@
>  
>  	OpenejbJarType plan;
>  
> -	public OpenEjbJarGeneralSection(Composite parent, FormToolkit toolkit,
> -			int style, EObject plan) {
> +	public OpenEjbJarGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
>  		super(parent, toolkit, style, plan);
>  		this.plan = (OpenejbJarType) plan;
>  		createClient();
>  	}
>  
> -	protected void createClient() {
> -		super.createClient();
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/AppGeneralSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/AppGeneralSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/AppGeneralSection.java	(working copy)
> @@ -26,8 +26,7 @@
>  
>  	ApplicationType plan;
>  
> -	public AppGeneralSection(Composite parent, FormToolkit toolkit, int style,
> -			EObject plan) {
> +	public AppGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
>  		super(parent, toolkit, style, plan);
>  		this.plan = (ApplicationType) plan;
>  		createClient();
> @@ -36,15 +35,6 @@
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> -	 * @see org.apache.geronimo.ui.sections.CommonGeneralSection#createClient()
> -	 */
> -	protected void createClient() {
> -		super.createClient();
> -	}
> -
> -	/*
> -	 * (non-Javadoc)
> -	 * 
>  	 * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getConfigIdEAttribute()
>  	 */
>  	protected EAttribute getConfigIdEAttribute() {
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java	(working copy)
> @@ -45,8 +45,7 @@
>  	 * @param toolkit
>  	 * @param style
>  	 */
> -	public DependencySection(EObject plan, EReference dependenciesERef,
> -			Composite parent, FormToolkit toolkit, int style) {
> +	public DependencySection(EObject plan, EReference dependenciesERef, Composite parent, FormToolkit toolkit, int style) {
>  		super(plan, parent, toolkit, style);
>  		this.dependenciesERef = dependenciesERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java	(working copy)
> @@ -38,8 +38,7 @@
>  			Messages.editorResRefNameTitle, Messages.editorResRefLinkTitle,
>  			Messages.editorResRefTargetNameTitle };
>  
> -	public ResourceRefSection(EObject plan, Composite parent,
> -			FormToolkit toolkit, int style, EReference resourceRefERef) {
> +	public ResourceRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference resourceRefERef) {
>  		super(plan, parent, toolkit, style);
>  		this.resourceRefERef = resourceRefERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java	(working copy)
> @@ -37,8 +37,7 @@
>  
>  	protected Text parentId;
>  
> -	public CommonGeneralSection(Composite parent, FormToolkit toolkit,
> -			int style, EObject plan) {
> +	public CommonGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
>  		super(parent, toolkit, style, plan);
>  	}
>  
> @@ -86,8 +85,7 @@
>  		});
>  	}
>  
> -	protected Label createLabel(Composite parent, String text,
> -			FormToolkit toolkit) {
> +	protected Label createLabel(Composite parent, String text, FormToolkit toolkit) {
>  		Label label = toolkit.createLabel(parent, text);
>  		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
>  		label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/BeansSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/BeansSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/BeansSection.java	(working copy)
> @@ -34,8 +34,7 @@
>  	 * @param toolkit
>  	 * @param style
>  	 */
> -	public BeansSection(EObject plan, Composite parent, FormToolkit toolkit,
> -			int style) {
> +	public BeansSection(EObject plan, Composite parent, FormToolkit toolkit, int style) {
>  		super(plan, parent, toolkit, style);
>  		createClient();
>  	}
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ConnectorGeneralSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ConnectorGeneralSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ConnectorGeneralSection.java	(working copy)
> @@ -26,17 +26,12 @@
>  
>  	ConnectorType plan;
>  
> -	public ConnectorGeneralSection(Composite parent, FormToolkit toolkit,
> -			int style, EObject plan) {
> +	public ConnectorGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
>  		super(parent, toolkit, style, plan);
>  		this.plan = (ConnectorType) plan;
>  		createClient();
>  	}
>  
> -	protected void createClient() {
> -		super.createClient();
> -	}
> -
>  	/*
>  	 * (non-Javadoc)
>  	 * 
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java	(working copy)
> @@ -34,8 +34,7 @@
>  
>  	private static final String[] COLUMN_NAMES = new String[] { Messages.editorServiceRefName };
>  
> -	public ServiceRefSection(EObject plan, Composite parent,
> -			FormToolkit toolkit, int style, EReference serviceRefERef) {
> +	public ServiceRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference serviceRefERef) {
>  		super(plan, parent, toolkit, style);
>  		this.serviceRefERef = serviceRefERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java	(working copy)
> @@ -43,8 +43,7 @@
>  	 * @param toolkit
>  	 * @param style
>  	 */
> -	public EjbRefSection(EObject plan, Composite parent, FormToolkit toolkit,
> -			int style, EReference ejbRefERef) {
> +	public EjbRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference ejbRefERef) {
>  		super(plan, parent, toolkit, style);
>  		this.ejbRefERef = ejbRefERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java	(working copy)
> @@ -38,8 +38,7 @@
>  			Messages.editorResEnvRefNameTitle,
>  			Messages.editorResEnvRefMsgDestTitle };
>  
> -	public ResourceEnvRefSection(EObject plan, Composite parent,
> -			FormToolkit toolkit, int style, EReference resourceEnvRefERef) {
> +	public ResourceEnvRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference resourceEnvRefERef) {
>  		super(plan, parent, toolkit, style);
>  		this.resourceEnvRefERef = resourceEnvRefERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java	(working copy)
> @@ -58,8 +58,7 @@
>  	 * @param toolkit
>  	 * @param style
>  	 */
> -	public SecuritySection(EObject plan, Composite parent, FormToolkit toolkit,
> -			int style, EReference securityERef) {
> +	public SecuritySection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference securityERef) {
>  		super(plan, parent, toolkit, style);
>  		this.securityERef = securityERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java	(working copy)
> @@ -37,8 +37,7 @@
>  	private static final String[] COLUMN_NAMES = new String[] {
>  			Messages.editorEjbRefTargetName, Messages.editorEjbRefEjbLink };
>  
> -	public EjbLocalRefSection(EObject plan, Composite parent,
> -			FormToolkit toolkit, int style, EReference ejbLocalRefERef) {
> +	public EjbLocalRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference ejbLocalRefERef) {
>  		super(plan, parent, toolkit, style);
>  		this.ejbLocalRefERef = ejbLocalRefERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java	(working copy)
> @@ -36,8 +36,7 @@
>  			Messages.editorGBeanRefName, Messages.editorGBeanRefType,
>  			Messages.editorGBeanRefProxyType };
>  
> -	public GBeanRefSection(EObject plan, Composite parent, FormToolkit toolkit,
> -			int style, EReference gbeanERef) {
> +	public GBeanRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference gbeanERef) {
>  		super(plan, parent, toolkit, style);
>  		this.gbeanERef = gbeanERef;
>  		createClient();
> Index: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java	(revision 0)
> +++ plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java	(revision 0)
> @@ -0,0 +1,154 @@
> +/**
> + * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
> + *
> + *  Licensed 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.v1.ui.editors;
> +
> +import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;
> +import org.apache.geronimo.st.v1.core.GeronimoV1Utils;
> +import org.apache.geronimo.st.v1.ui.internal.Messages;
> +import org.apache.geronimo.st.v1.ui.pages.AppGeneralPage;
> +import org.apache.geronimo.st.v1.ui.pages.ConnectorOverviewPage;
> +import org.apache.geronimo.st.v1.ui.pages.DeploymentPage;
> +import org.apache.geronimo.st.v1.ui.pages.EjbOverviewPage;
> +import org.apache.geronimo.st.v1.ui.pages.NamingFormPage;
> +import org.apache.geronimo.st.v1.ui.pages.SecurityPage;
> +import org.apache.geronimo.st.v1.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.connector.ConnectorPackage;
> +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 {
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addApplicationPlanPages(org.eclipse.ui.forms.editor.FormEditor)
> +	 */
> +	public void addApplicationPlanPages(FormEditor editor) throws PartInitException {
> +		editor.addPage(new AppGeneralPage(editor, "appgeneralpage", Messages.editorTabGeneral));
> +		editor.addPage(new SecurityPage(editor, "securitypage", Messages.editorTabSecurity, ApplicationPackage.eINSTANCE.getApplicationType_Security()));
> +		editor.addPage(getApplicationDeploymentPage(editor));
> +	}
> +
> +	/* (non-Javadoc)
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addConnectorPlanPages(org.eclipse.ui.forms.editor.FormEditor)
> +	 */
> +	public void addConnectorPlanPages(FormEditor editor) throws PartInitException {
> +		editor.addPage(new ConnectorOverviewPage(editor, "connectoroverview", Messages.editorTabGeneral));
> +		editor.addPage(getConnectorDeploymentPage(editor));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addOpenEjbPlanPages()
> +	 */
> +	public void addOpenEjbPlanPages(FormEditor editor) throws PartInitException {
> +		editor.addPage(new EjbOverviewPage(editor, "ejboverview", Messages.editorTabGeneral));
> +		// TODO Add naming page but broken down for each bean type
> +		editor.addPage(new SecurityPage(editor, "securitypage", Messages.editorTabSecurity, JarPackage.eINSTANCE.getOpenejbJarType_Security()));
> +		editor.addPage(getEjbJarDeploymentPage(editor));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addWebPlanPages()
> +	 */
> +	public void addWebPlanPages(FormEditor editor) throws PartInitException {
> +		editor.addPage(new WebGeneralPage(editor, "generalpage", Messages.editorTabGeneral));
> +		editor.addPage(getWebNamingPage(editor));
> +		editor.addPage(new SecurityPage(editor, "securitypage", Messages.editorTabSecurity, WebPackageImpl.eINSTANCE.getWebAppType_Security()));
> +		editor.addPage(getWebDeploymentPage(editor));
> +	}
> +
> +	/*
> +	 * (non-Javadoc)
> +	 * 
> +	 * @see org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader#loadDeploymentPlan(org.eclipse.core.resources.IFile)
> +	 */
> +	public EObject loadDeploymentPlan(IFile file) {
> +		return GeronimoV1Utils.getWebDeploymentPlan(file);
> +	}
> +
> +	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();
> +		return formPage;
> +	}
> +
> +	protected FormPage getWebDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		WebPackage pkg = WebFactory.eINSTANCE.getWebPackage();
> +		formPage.dependencies = pkg.getWebAppType_Dependency();
> +		formPage.imports = pkg.getWebAppType_Import();
> +		formPage.gbeans = pkg.getWebAppType_Gbean();
> +		return formPage;
> +	}
> +	
> +	private FormPage getEjbJarDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		JarPackage pkg = JarFactory.eINSTANCE.getJarPackage();
> +		formPage.dependencies = pkg.getOpenejbJarType_Dependency();
> +		formPage.imports = pkg.getOpenejbJarType_Import();
> +		formPage.gbeans = pkg.getOpenejbJarType_Gbean();
> +		return formPage;
> +	}
> +	
> +	protected FormPage getApplicationDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		ApplicationPackage pkg = ApplicationFactory.eINSTANCE.getApplicationPackage();
> +		formPage.dependencies = pkg.getApplicationType_Dependency();
> +		formPage.imports = pkg.getApplicationType_Import();
> +		formPage.gbeans = pkg.getApplicationType_Gbean();
> +		return formPage;
> +	}
> +	
> +	private FormPage getConnectorDeploymentPage(FormEditor editor) {
> +		DeploymentPage formPage = createDeploymentFormPage(editor);
> +		ConnectorPackage pkg = ConnectorFactory.eINSTANCE.getConnectorPackage();
> +		formPage.dependencies = pkg.getConnectorType_Dependency();
> +		formPage.imports = pkg.getConnectorType_Import();
> +		formPage.gbeans = pkg.getConnectorType_Gbean();
> +		return formPage;
> +	}
> +	
> +	//TODO push to superclass
> +	private NamingFormPage createNamingFormPage(FormEditor editor) {
> +		return new NamingFormPage(editor, "namingpage", Messages.editorTabNaming);
> +	}
> +	
> +	//TODO Push to superclass
> +	private DeploymentPage createDeploymentFormPage(FormEditor editor) {
> +		return new DeploymentPage(editor, "deploymentpage", Messages.editorTabDeployment);
> +	}
> +}
> 
> Property changes on: plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java
> ___________________________________________________________________
> Name: svn:mime-type
>    + text/plain
> Name: svn:keywords
>    + Date Rev
> Name: svn:eol-style
>    + native
> 
> Index: plugins/org.apache.geronimo.st.v1.ui/plugin.xml
> ===================================================================
> --- plugins/org.apache.geronimo.st.v1.ui/plugin.xml	(revision 410271)
> +++ plugins/org.apache.geronimo.st.v1.ui/plugin.xml	(working copy)
> @@ -24,35 +24,8 @@
>              path="icons/obj16/littleG.gif"/>
>      </extension>
>      
> -    <extension point="org.eclipse.ui.editors">
> -        <editor class="org.apache.geronimo.st.v1.ui.editors.WebEditor"
> -            default="true" 
> -            filenames="geronimo-web.xml"
> -            icon="icons/obj16/littleG.gif"
> -            id="org.apache.geronimo.ui.editors.WebEditor" 
> -            name="%webEditorName">
> -        </editor>
> -        <editor
> -            class="org.apache.geronimo.st.v1.ui.editors.ApplicationPlanEditor"
> -            default="true" 
> -            filenames="geronimo-application.xml"
> -            icon="icons/obj16/littleG.gif"
> -            id="org.apache.geronimo.ui.editors.ApplicationPlanEditor"
> -            name="%appEditorName">
> -        </editor>
> -        <editor class="org.apache.geronimo.st.v1.ui.editors.OpenEjbPlanEditor"
> -            default="true" 
> -            filenames="openejb-jar.xml"
> -            icon="icons/obj16/littleG.gif"
> -            id="org.apache.geronimo.ui.editors.OpenEjbPlanEditor"
> -            name="%openEjbEditorName">
> -        </editor>
> -        <editor class="org.apache.geronimo.st.v1.ui.editors.ConnectorPlanEditor"
> -            default="true" 
> -            filenames="geronimo-connector.xml"
> -            icon="icons/obj16/littleG.gif"
> -            id="org.apache.geronimo.ui.editors.ConnectorPlanEditorr"
> -            name="%connectorEditorName">
> -        </editor>
> +    <extension point="org.apache.geronimo.st.ui.loader">
> +    	<loader class="org.apache.geronimo.st.v1.ui.editors.GeronimoFormContentLoader" version="1.0"/>
>      </extension>
> +
>  </plugin>
> 
> 
> ------------------------------------------------------------------------
> 
> 
> -sachin
> 
> 

Mime
View raw message