You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/04/12 22:03:02 UTC

svn commit: r393587 [5/7] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/ org.apache.geronimo.st.core/META-INF/ org.apache.geronimo.st.core/src/ org.apache.geronimo.st.core/src/org/ org.apache.geronimo.st.core/src/org...

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,167 @@
+/**
+ * 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.core.operations;
+
+import org.apache.geronimo.st.core.GeronimoSchemaNS;
+import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation;
+import org.apache.geronimo.st.v1.core.GeronimoV1Utils;
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationFactory;
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorFactory;
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
+import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
+import org.apache.geronimo.xml.ns.j2ee.web.WebFactory;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.openejb.xml.ns.openejb.jar.JarFactory;
+import org.openejb.xml.ns.openejb.jar.OpenejbJarType;
+
+public class V1DeploymentPlanCreationOperation extends
+		DeploymentPlanCreationOperation {
+
+	public V1DeploymentPlanCreationOperation(IDataModel model) {
+		super(model);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public EObject createGeronimoApplicationDeploymentPlan(IFile dpFile) {
+		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString());
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+		GeronimoV1Utils.registerAppFactoryAndPackage(resourceSet);
+
+		Resource resource = resourceSet.createResource(uri);
+		org.apache.geronimo.xml.ns.j2ee.application.DocumentRoot documentRoot = ApplicationFactory.eINSTANCE.createDocumentRoot();
+		ApplicationType root = ApplicationFactory.eINSTANCE.createApplicationType();
+
+		EMap map = documentRoot.getXMLNSPrefixMap();
+		map.put("", GeronimoSchemaNS.GERONIMO_APP_NS);
+		map.put("sec", GeronimoSchemaNS.GERONIMO_SECURITY_NS);
+		map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS);
+
+		root.setApplicationName(getComponentName());
+		root.setConfigId(getProject().getName() + "/" + getComponentName());
+
+		documentRoot.setApplication(root);
+		resource.getContents().add(documentRoot);
+
+		save(resource);
+
+		return root;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoWebDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public EObject createGeronimoWebDeploymentPlan(IFile dpFile) {
+
+		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString());
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+		GeronimoV1Utils.registerWebFactoryAndPackage(resourceSet);
+
+		Resource resource = resourceSet.createResource(uri);
+		org.apache.geronimo.xml.ns.j2ee.web.DocumentRoot documentRoot = WebFactory.eINSTANCE.createDocumentRoot();
+
+		EMap map = documentRoot.getXMLNSPrefixMap();
+		map.put("", GeronimoSchemaNS.GERONIMO_WEB_NS);
+		map.put("sec", GeronimoSchemaNS.GERONIMO_SECURITY_NS);
+		map.put("nam", GeronimoSchemaNS.GERONIMO_NAMING_NS);
+		map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS);
+
+		WebAppType root = WebFactory.eINSTANCE.createWebAppType();
+
+		root.setConfigId(getProject().getName() + "/" + getComponentName());
+		root.setContextRoot("/" + getComponentName());
+		root.setContextPriorityClassloader(false);
+
+		documentRoot.setWebApp(root);
+		resource.getContents().add(documentRoot);
+
+		save(resource);
+
+		return root;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createOpenEjbDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public EObject createOpenEjbDeploymentPlan(IFile dpFile) {
+		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString());
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+		GeronimoV1Utils.registerEjbFactoryAndPackage(resourceSet);
+
+		Resource resource = resourceSet.createResource(uri);
+		org.openejb.xml.ns.openejb.jar.DocumentRoot documentRoot = JarFactory.eINSTANCE.createDocumentRoot();
+		OpenejbJarType root = JarFactory.eINSTANCE.createOpenejbJarType();
+
+		EMap map = documentRoot.getXMLNSPrefixMap();
+		map.put("", GeronimoSchemaNS.GERONIMO_OPENEJB_NS);
+		map.put("sec", GeronimoSchemaNS.GERONIMO_SECURITY_NS);
+		map.put("nam", GeronimoSchemaNS.GERONIMO_NAMING_NS);
+		map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS);
+		map.put("pkgen", GeronimoSchemaNS.GERONIMO_PKGEN_NS);
+
+		root.setConfigId(getProject().getName() + "/" + getComponentName());
+
+		root.setEnterpriseBeans(JarFactory.eINSTANCE.createEnterpriseBeansType());
+
+		documentRoot.setOpenejbJar(root);
+		resource.getContents().add(documentRoot);
+
+		save(resource);
+
+		return root;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createConnectorDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public EObject createConnectorDeploymentPlan(IFile dpFile) {
+		URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString());
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+		GeronimoV1Utils.registerEjbFactoryAndPackage(resourceSet);
+
+		Resource resource = resourceSet.createResource(uri);
+		org.apache.geronimo.xml.ns.j2ee.connector.DocumentRoot documentRoot = ConnectorFactory.eINSTANCE.createDocumentRoot();
+		ConnectorType root = ConnectorFactory.eINSTANCE.createConnectorType();
+
+		EMap map = documentRoot.getXMLNSPrefixMap();
+		map.put("", GeronimoSchemaNS.GERONIMO_CONNECTOR_NS);
+		map.put("nam", GeronimoSchemaNS.GERONIMO_NAMING_NS);
+		map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS);
+
+		root.setConfigId(getProject().getName() + "/" + getComponentName());
+
+		documentRoot.setConnector(root);
+		resource.getContents().add(documentRoot);
+
+		save(resource);
+
+		return root;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.classpath
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.classpath?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.classpath (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.classpath Wed Apr 12 13:02:48 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.project
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.project?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.project (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/.project Wed Apr 12 13:02:48 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.geronimo.st.v1.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF Wed Apr 12 13:02:48 2006
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Geronimo Server Tools V1 UI Plug-in
+Bundle-SymbolicName: org.apache.geronimo.st.v1.ui;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Activator: org.apache.geronimo.st.v1.ui.Activator
+Bundle-Vendor: Apache
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.apache.geronimo.st.v1.core,
+ org.eclipse.jst.server.generic.ui,
+ org.eclipse.wst.server.ui,
+ org.eclipse.jst.server.generic.core,
+ org.eclipse.wst.server.core,
+ org.eclipse.jst.server.core,
+ org.apache.geronimo.st.ui,
+ org.eclipse.ui.forms,
+ org.eclipse.emf.ecore,
+ org.apache.geronimo.deployment.model.edit,
+ org.apache.geronimo.deployment.model,
+ org.apache.geronimo.st.core,
+ org.eclipse.core.resources,
+ org.eclipse.wst.common.modulecore
+Eclipse-AutoStart: true

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/build.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/build.properties?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/build.properties (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/build.properties Wed Apr 12 13:02:48 2006
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/build.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/build.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/bigG.gif
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/bigG.gif?rev=393587&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/bigG.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/g_banner.gif
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/g_banner.gif?rev=393587&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/g_banner.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/g_server.gif
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/g_server.gif?rev=393587&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/g_server.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/obj16/feature.gif
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/obj16/feature.gif?rev=393587&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/obj16/feature.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/obj16/littleG.gif
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/obj16/littleG.gif?rev=393587&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/icons/obj16/littleG.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.properties?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.properties (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.properties Wed Apr 12 13:02:48 2006
@@ -0,0 +1,9 @@
+pluginName=Geronimo Server Tools V1 UI
+providerName=Apache Software Foundation
+
+webEditorName=Geronimo Web Deployment Plan Editor
+appEditorName=Geronimo Application Deployment Plan Editor
+openEjbEditorName=OpenEJB Deployment Plan Editor
+connectorEditorName=Geronimo Connector Plan Editor
+
+PopupMenus.launchconsole=Launch Geronimo Console
\ No newline at end of file

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.xml?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.xml Wed Apr 12 13:02:48 2006
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+    
+    <extension point="org.eclipse.wst.server.ui.wizardFragments">
+        <fragment id="org.eclipse.jst.server.generic.runtime"
+            typeIds="org.apache.geronimo.generic.runtime.10"
+            class="org.apache.geronimo.st.v1.ui.internal.GeronimoServerRuntimeWizardFragment"/>
+        <fragment id="org.eclipse.jst.server.generic.server"
+            typeIds="org.apache.geronimo.generic.server.10"
+            class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"/>
+    </extension>
+    
+	<extension point="org.eclipse.wst.server.ui.serverImages">
+    	<image id="org.apache.geronimo.generic.runtime.image"
+            icon="icons/obj16/littleG.gif"
+            typeIds="org.apache.geronimo.generic.runtime.10"/>
+        <image id="org.apache.geronimo.generic.server.image"
+            icon="icons/obj16/littleG.gif"
+            typeIds="org.apache.geronimo.generic.server.10"/>
+    </extension>
+    
+    <extension point="org.eclipse.wst.common.project.facet.ui.images">
+        <image facet="org.apache.geronimo.facet"
+            path="icons/obj16/littleG.gif"/>
+        <image runtime-component-type="org.apache.geronimo.runtime"
+            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>
+</plugin>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/plugin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/Activator.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/Activator.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/Activator.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/Activator.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,52 @@
+package org.apache.geronimo.st.v1.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.apache.geronimo.st.v1.ui";
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 * 
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/Activator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/Activator.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/Activator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ApplicationPlanEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ApplicationPlanEditor.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ApplicationPlanEditor.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ApplicationPlanEditor.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,69 @@
+/**
+ * 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.AbstractGeronimoDeploymentPlanEditor;
+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.DeploymentPage;
+import org.apache.geronimo.st.v1.ui.pages.SecurityPage;
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationFactory;
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.forms.editor.FormPage;
+
+public class ApplicationPlanEditor extends AbstractGeronimoDeploymentPlanEditor {
+
+	public ApplicationPlanEditor() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
+	 */
+	public void doAddPages() throws PartInitException {
+		if (getDeploymentPlan() != null) {
+			addPage(new AppGeneralPage(this, "appgeneralpage", Messages.editorTabGeneral));
+			addPage(new SecurityPage(this, "securitypage", Messages.editorTabSecurity, ApplicationPackage.eINSTANCE.getApplicationType_Security()));
+			addPage(getDeploymentPage());
+		}
+		addSourcePage();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public EObject loadDeploymentPlan(IFile file) {
+		return GeronimoV1Utils.getApplicationDeploymentPlan(file);
+	}
+
+	private FormPage getDeploymentPage() {
+		DeploymentPage formPage = new DeploymentPage(this, "deploymentpage", Messages.editorTabDeployment);
+		ApplicationPackage pkg = ApplicationFactory.eINSTANCE.getApplicationPackage();
+		formPage.dependencies = pkg.getApplicationType_Dependency();
+		formPage.imports = pkg.getApplicationType_Import();
+		formPage.gbeans = pkg.getApplicationType_Gbean();
+		return formPage;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ApplicationPlanEditor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ApplicationPlanEditor.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ApplicationPlanEditor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ConnectorPlanEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ConnectorPlanEditor.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ConnectorPlanEditor.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ConnectorPlanEditor.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,62 @@
+/**
+ * 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.AbstractGeronimoDeploymentPlanEditor;
+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.ConnectorOverviewPage;
+import org.apache.geronimo.st.v1.ui.pages.DeploymentPage;
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorFactory;
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.forms.editor.FormPage;
+
+public class ConnectorPlanEditor extends AbstractGeronimoDeploymentPlanEditor {
+
+	public ConnectorPlanEditor() {
+		super();
+	}
+
+	public void doAddPages() throws PartInitException {
+		if (getDeploymentPlan() != null) {
+			addPage(new ConnectorOverviewPage(this, "connectoroverview", Messages.editorTabGeneral));
+			addPage(getDeploymentPage());
+		}
+		addSourcePage();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public EObject loadDeploymentPlan(IFile file) {
+		return GeronimoV1Utils.getConnectorDeploymentPlan(file);
+	}
+
+	private FormPage getDeploymentPage() {
+		DeploymentPage formPage = new DeploymentPage(this, "deploymentpage", Messages.editorTabDeployment);
+		ConnectorPackage pkg = ConnectorFactory.eINSTANCE.getConnectorPackage();
+		formPage.dependencies = pkg.getConnectorType_Dependency();
+		formPage.imports = pkg.getConnectorType_Import();
+		formPage.gbeans = pkg.getConnectorType_Gbean();
+		return formPage;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ConnectorPlanEditor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ConnectorPlanEditor.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/ConnectorPlanEditor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/OpenEjbPlanEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/OpenEjbPlanEditor.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/OpenEjbPlanEditor.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/OpenEjbPlanEditor.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,68 @@
+/**
+ * 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.AbstractGeronimoDeploymentPlanEditor;
+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.DeploymentPage;
+import org.apache.geronimo.st.v1.ui.pages.EjbOverviewPage;
+import org.apache.geronimo.st.v1.ui.pages.SecurityPage;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ui.PartInitException;
+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 OpenEjbPlanEditor extends AbstractGeronimoDeploymentPlanEditor {
+
+	/**
+	 * 
+	 */
+	public OpenEjbPlanEditor() {
+		super();
+	}
+
+	public void doAddPages() throws PartInitException {
+		if (getDeploymentPlan() != null) {
+			addPage(new EjbOverviewPage(this, "ejboverview", Messages.editorTabGeneral));
+			// TODO Add naming page but broken down for each bean type
+			addPage(new SecurityPage(this, "securitypage", Messages.editorTabSecurity, JarPackage.eINSTANCE.getOpenejbJarType_Security()));
+			addPage(getDeploymentPage());
+		}
+		addSourcePage();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public EObject loadDeploymentPlan(IFile file) {
+		return GeronimoV1Utils.getOpenEjbDeploymentPlan(file);
+	}
+
+	private FormPage getDeploymentPage() {
+		DeploymentPage formPage = new DeploymentPage(this, "deploymentpage", Messages.editorTabDeployment);
+		JarPackage pkg = JarFactory.eINSTANCE.getJarPackage();
+		formPage.dependencies = pkg.getOpenejbJarType_Dependency();
+		formPage.imports = pkg.getOpenejbJarType_Import();
+		formPage.gbeans = pkg.getOpenejbJarType_Gbean();
+		return formPage;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/OpenEjbPlanEditor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/OpenEjbPlanEditor.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/OpenEjbPlanEditor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/WebEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/WebEditor.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/WebEditor.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/WebEditor.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,75 @@
+/**
+ * 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.AbstractGeronimoDeploymentPlanEditor;
+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.DeploymentPage;
+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.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.FormPage;
+
+public class WebEditor extends AbstractGeronimoDeploymentPlanEditor {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
+	 */
+	public void doAddPages() throws PartInitException {
+		if (getDeploymentPlan() != null) {
+			addPage(new WebGeneralPage(this, "generalpage", Messages.editorTabGeneral));
+			addPage(getNamingPage());
+			addPage(new SecurityPage(this, "securitypage", Messages.editorTabSecurity, WebPackageImpl.eINSTANCE.getWebAppType_Security()));
+			addPage(getDeploymentPage());
+		}
+		addSourcePage();
+	}
+
+	public EObject loadDeploymentPlan(IFile file) {
+		return GeronimoV1Utils.getWebDeploymentPlan(file);
+	}
+
+	private FormPage getNamingPage() {
+		NamingFormPage formPage = new NamingFormPage(this, "namingpage", Messages.editorTabNaming);
+		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;
+	}
+
+	private FormPage getDeploymentPage() {
+		DeploymentPage formPage = new DeploymentPage(this, "deploymentpage", Messages.editorTabDeployment);
+		WebPackage pkg = WebFactory.eINSTANCE.getWebPackage();
+		formPage.dependencies = pkg.getWebAppType_Dependency();
+		formPage.imports = pkg.getWebAppType_Import();
+		formPage.gbeans = pkg.getWebAppType_Gbean();
+		return formPage;
+	}
+
+}
\ No newline at end of file

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/WebEditor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/WebEditor.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/WebEditor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/ConfirmInstallDialog.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/ConfirmInstallDialog.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/ConfirmInstallDialog.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/ConfirmInstallDialog.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,75 @@
+/**
+ * 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.internal;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.osgi.util.NLS;
+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.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+public class ConfirmInstallDialog extends Dialog {
+
+	private String installPath = null;
+
+	public ConfirmInstallDialog(Shell parentShell, String installPath) {
+		super(parentShell);
+		this.installPath = installPath;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
+	 */
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		newShell.setText(Messages.installTitle);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createDialogArea(Composite parent) { // create a
+															// composite with
+															// standard margins
+															// and spacing
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		composite.setFont(parent.getFont());
+		Label label = new Label(composite, SWT.WRAP);
+		label.setText(NLS.bind(Messages.installMessage, new String[] { installPath }));
+		GridData data = new GridData();
+		data.widthHint = 400;
+		label.setLayoutData(data);
+		Dialog.applyDialogFont(composite);
+		return composite;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/ConfirmInstallDialog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/ConfirmInstallDialog.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/ConfirmInstallDialog.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,54 @@
+/**
+ * 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.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.geronimo.xml.ns.deployment.provider.DeploymentItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.application.client.provider.ClientItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.application.provider.ApplicationItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.connector.provider.ConnectorItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.security.provider.SecurityItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.openejb.xml.ns.openejb.jar.provider.JarItemProviderAdapterFactory;
+import org.openejb.xml.ns.pkgen.provider.PkgenItemProviderAdapterFactory;
+
+public class EMFEditorContext {
+	
+	private static ComposedAdapterFactory factory;
+
+	static {
+		List factories = new ArrayList();
+		factories.add(new DeploymentItemProviderAdapterFactory());
+		factories.add(new ClientItemProviderAdapterFactory());
+		factories.add(new ApplicationItemProviderAdapterFactory());
+		factories.add(new ConnectorItemProviderAdapterFactory());
+		factories.add(new WebItemProviderAdapterFactory());
+		factories.add(new NamingItemProviderAdapterFactory());
+		factories.add(new SecurityItemProviderAdapterFactory());
+		factories.add(new JarItemProviderAdapterFactory());
+		factories.add(new PkgenItemProviderAdapterFactory());
+		factory = new ComposedAdapterFactory(factories);
+	}
+
+	public static ComposedAdapterFactory getFactory() {
+		return factory;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/GeronimoServerRuntimeWizardFragment.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/GeronimoServerRuntimeWizardFragment.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/GeronimoServerRuntimeWizardFragment.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/GeronimoServerRuntimeWizardFragment.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,402 @@
+/**
+ * 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.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.geronimo.st.ui.Activator;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
+import org.eclipse.jst.server.generic.servertype.definition.Property;
+import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
+import org.eclipse.jst.server.generic.ui.internal.GenericServerComposite;
+import org.eclipse.jst.server.generic.ui.internal.GenericServerCompositeDecorator;
+import org.eclipse.jst.server.generic.ui.internal.GenericServerUIMessages;
+import org.eclipse.jst.server.generic.ui.internal.JRESelectDecorator;
+import org.eclipse.jst.server.generic.ui.internal.SWTUtil;
+import org.eclipse.jst.server.generic.ui.internal.ServerDefinitionTypeAwareWizardFragment;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.TaskModel;
+import org.eclipse.wst.server.core.internal.IInstallableRuntime;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.eclipse.wst.server.core.model.RuntimeDelegate;
+import org.eclipse.wst.server.ui.wizard.IWizardHandle;
+
+public class GeronimoServerRuntimeWizardFragment extends
+		ServerDefinitionTypeAwareWizardFragment {
+
+	private static final String G_WITH_TOMCAT_ID = "org.apache.geronimo.runtime.tomcat.10";
+	private static final String G_WITH_JETTY_ID = "org.apache.geronimo.runtime.jetty.10";
+
+	private GenericServerCompositeDecorator[] fDecorators;
+	protected Text installDir;
+
+	private Button tomcat;
+	private Button jetty;
+
+	private Group group;
+
+	public GeronimoServerRuntimeWizardFragment() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jst.server.generic.ui.internal.ServerDefinitionTypeAwareWizardFragment#description()
+	 */
+	public String description() {
+		return Messages.serverWizardDescription;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jst.server.generic.ui.internal.ServerDefinitionTypeAwareWizardFragment#title()
+	 */
+	public String title() {
+		return GenericServerUIMessages.bind(GenericServerUIMessages.runtimeWizardTitle, getRuntimeName());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jst.server.generic.ui.internal.ServerDefinitionTypeAwareWizardFragment#createContent(org.eclipse.swt.widgets.Composite,
+	 *      org.eclipse.wst.server.ui.wizard.IWizardHandle)
+	 */
+	public void createContent(Composite parent, IWizardHandle handle) {
+
+		getWizard().setImageDescriptor(Activator.getImageDescriptor(Activator.IMG_WIZ_GERONIMO));
+
+		fDecorators = new GenericServerCompositeDecorator[1];
+		fDecorators[0] = new GeronimoJRESelectDecorator(getRuntimeDelegate());
+		GenericServerComposite composite = new GenericServerComposite(parent, fDecorators);
+
+		Label label = new Label(composite, SWT.NONE);
+		label.setText(Messages.installDir);
+		GridData data = new GridData();
+		data.horizontalSpan = 3;
+		label.setLayoutData(data);
+		label.setToolTipText(Messages.tooltipLoc);
+
+		installDir = new Text(composite, SWT.BORDER);
+
+		IPath currentLocation = getRuntimeDelegate().getRuntimeWorkingCopy().getLocation();
+		if (currentLocation != null) {
+			installDir.setText(currentLocation.toOSString());
+		}
+
+		data = new GridData(GridData.FILL_HORIZONTAL);
+		data.horizontalSpan = 2;
+		installDir.setLayoutData(data);
+		installDir.setToolTipText(Messages.tooltipLoc);
+		installDir.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				getRuntimeDelegate().getRuntimeWorkingCopy().setLocation(new Path(installDir.getText()));
+				validate();
+			}
+		});
+
+		final Composite browseComp = composite;
+		Button browse = SWTUtil.createButton(composite, Messages.browse);
+		browse.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent se) {
+				DirectoryDialog dialog = new DirectoryDialog(browseComp.getShell());
+				dialog.setMessage(Messages.installDir);
+				dialog.setFilterPath(installDir.getText());
+				String selectedDirectory = dialog.open();
+				if (selectedDirectory != null)
+					installDir.setText(selectedDirectory);
+			}
+		});
+
+		data = new GridData();
+		data = new GridData(GridData.FILL_BOTH);
+		data.horizontalSpan = 3;
+
+		final IInstallableRuntime gWithTomcat = ServerPlugin.findInstallableRuntime(G_WITH_TOMCAT_ID);
+		final IInstallableRuntime gWithJetty = ServerPlugin.findInstallableRuntime(G_WITH_JETTY_ID);
+
+		if (gWithTomcat != null && gWithJetty != null) {
+			group = new Group(composite, SWT.NONE);
+			group.setText(Messages.downloadOptions);
+			group.setLayoutData(data);
+			group.setLayout(composite.getLayout());
+			group.setEnabled(false);
+
+			Label webContainer = new Label(group, SWT.NONE);
+			webContainer.setText(Messages.chooseWebContainer);
+			data = new GridData();
+			data.horizontalSpan = 3;
+			webContainer.setLayoutData(data);
+
+			tomcat = new Button(group, SWT.RADIO);
+			tomcat.setSelection(true);
+			tomcat.setText(Messages.gWithTomcat);
+			data = new GridData();
+			data.horizontalSpan = 3;
+			tomcat.setLayoutData(data);
+			tomcat.setToolTipText(Messages.tooltipTomcat);
+
+			jetty = new Button(group, SWT.RADIO);
+			jetty.setText(Messages.gWithJetty);
+			data = new GridData();
+			data.horizontalSpan = 3;
+			jetty.setLayoutData(data);
+			jetty.setToolTipText(Messages.tooltipJetty);
+
+			Button install = SWTUtil.createButton(group, Messages.install);
+			data = new GridData();
+			data.horizontalSpan = 3;
+			install.setLayoutData(data);
+			install.setToolTipText(Messages.tooltipInstall);
+			install.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent se) {
+					if (installDir != null && isValidLocation()) {
+						Shell shell = installDir.getShell();
+						ConfirmInstallDialog dialog = new ConfirmInstallDialog(shell, installDir.getText());
+						dialog.open();
+						if (dialog.getReturnCode() == IDialogConstants.OK_ID) {
+
+							final IInstallableRuntime installable = tomcat.getSelection() ? gWithTomcat
+									: gWithJetty;
+							final Path installPath = new Path(installDir.getText());
+							IRunnableWithProgress runnable = new IRunnableWithProgress() {
+								public void run(IProgressMonitor monitor)
+										throws InvocationTargetException,
+										InterruptedException {
+									try {
+										installable.install(installPath, monitor);
+									} catch (CoreException e) {
+										Trace.trace(Trace.SEVERE, "Error installing runtime", e);
+									}
+								}
+							};
+
+							try {
+								getWizard().run(true, false, runnable);
+							} catch (InterruptedException e) {
+								e.printStackTrace();
+							} catch (InvocationTargetException e) {
+								e.printStackTrace();
+							} catch (Exception e) {
+								Trace.trace(Trace.SEVERE, "Error installing runtime", e);
+							}
+
+							updateInstallDir(installPath);
+
+						}
+					}
+				}
+
+				boolean isValidLocation() {
+					return true;
+				}
+
+				void updateInstallDir(IPath installPath) {
+					installPath = installPath.append("geronimo-1.0");
+					installDir.setText(installPath.toOSString());
+				}
+			});
+		}
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.server.ui.wizard.WizardFragment#isComplete()
+	 */
+	public boolean isComplete() {
+		IRuntimeWorkingCopy runtimeWC = getRuntimeDelegate().getRuntimeWorkingCopy();
+		IStatus status = runtimeWC.validate(null);
+		return status == null || status.isOK();
+	}
+
+	protected void validate() {
+
+		IRuntime runtime = getRuntimeDelegate().getRuntime();
+
+		if (runtime == null) {
+			getWizard().setMessage("", IMessageProvider.ERROR);
+			return;
+		}
+
+		IRuntimeWorkingCopy runtimeWC = getRuntimeDelegate().getRuntimeWorkingCopy();
+		getRuntimeDelegate().setServerDefinitionId(runtime.getRuntimeType().getId());
+		getRuntimeDelegate().setServerInstanceProperties(getValues());
+
+		IStatus status = runtimeWC.validate(null);
+		if (status == null || status.isOK()) {
+			getWizard().setMessage(null, IMessageProvider.NONE);
+			group.setEnabled(false);
+		} else {
+			getWizard().setMessage(status.getMessage(), IMessageProvider.ERROR);
+			Path installPath = new Path(installDir.getText());
+			if (installPath.toFile().exists()) {
+				group.setEnabled(true);
+			}
+			return;
+		}
+
+		if (!isValidVM()) {
+			getWizard().setMessage(Messages.jvmWarning, IMessageProvider.WARNING);
+			return;
+		}
+
+		getWizard().setMessage(null, IMessageProvider.NONE);
+
+		// validateDecorators();
+	}
+
+	private boolean isValidVM() {
+		String vmId = getRuntimeDelegate().getVMInstallId();
+		return vmId != null && vmId.startsWith("1.4");
+	}
+
+	private void validateDecorators() {
+		for (int i = 0; i < fDecorators.length; i++) {
+			if (fDecorators[i].validate())
+				return;
+		}
+	}
+
+	private Map getValues() {
+		Map propertyMap = new HashMap();
+		if (getRuntimeDelegate() != null) {
+			ServerRuntime definition = getServerTypeDefinition(getServerDefinitionId(), getRuntimeDelegate().getServerInstanceProperties());
+			if (definition != null) {
+				List properties = definition.getProperty();
+				for (int i = 0; i < properties.size(); i++) {
+					Property property = (Property) properties.get(i);
+					if (Property.CONTEXT_RUNTIME.equals(property.getContext())) {
+						if (Property.TYPE_DIRECTORY.equals(property.getType())) {
+							propertyMap.put(property.getId(), installDir.getText());
+						}
+					}
+				}
+			}
+		}
+		return propertyMap;
+	}
+
+	private String getServerDefinitionId() {
+		String currentDefinition = null;
+		if (getRuntimeDelegate() != null)
+			currentDefinition = getRuntimeDelegate().getRuntime().getRuntimeType().getId();
+		if (currentDefinition != null && currentDefinition.length() > 0) {
+			return currentDefinition;
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.server.ui.wizard.WizardFragment#enter()
+	 */
+	public void enter() {
+		if (getRuntimeDelegate() != null)
+			getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName());
+		validate();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.server.ui.wizard.WizardFragment#exit()
+	 */
+	public void exit() {
+		validate();
+	}
+
+	private GenericServerRuntime getRuntimeDelegate() {
+		IRuntimeWorkingCopy wc = (IRuntimeWorkingCopy) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+		if (wc == null)
+			return null;
+		return (GenericServerRuntime) wc.loadAdapter(GenericServerRuntime.class, new NullProgressMonitor());
+	}
+
+	private String createName() {
+		RuntimeDelegate dl = getRuntimeDelegate();
+		IRuntimeType runtimeType = dl.getRuntime().getRuntimeType();
+		String name = GenericServerUIMessages.bind(GenericServerUIMessages.runtimeName, runtimeType.getName());
+		IRuntime[] list = ServerCore.getRuntimes();
+		int suffix = 1;
+		String suffixName = name;
+		for (int i = 0; i < list.length; i++) {
+			if ((list[i].getName().equals(name) || list[i].getName().equals(suffixName))
+					&& !list[i].equals(dl.getRuntime()))
+				suffix++;
+			suffixName = name + " " + suffix;
+		}
+
+		if (suffix > 1)
+			return suffixName;
+		return name;
+	}
+
+	private String getRuntimeName() {
+		if (getRuntimeDelegate() != null
+				&& getRuntimeDelegate().getRuntime() != null)
+			return getRuntimeDelegate().getRuntime().getName();
+		return null;
+	}
+
+	private class GeronimoJRESelectDecorator extends JRESelectDecorator {
+		public GeronimoJRESelectDecorator(GenericServerRuntime runtime) {
+			super(runtime);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see org.eclipse.jst.server.generic.ui.internal.GenericServerCompositeDecorator#validate()
+		 */
+		public boolean validate() {
+			GeronimoServerRuntimeWizardFragment.this.validate();
+			return true;
+		}
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/GeronimoServerRuntimeWizardFragment.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/GeronimoServerRuntimeWizardFragment.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/GeronimoServerRuntimeWizardFragment.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,179 @@
+package org.apache.geronimo.st.v1.ui.internal;
+
+import org.apache.geronimo.st.v1.ui.Activator;
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Translated messages.
+ */
+public class Messages extends NLS {
+	public static String appGeneralPageTitle;
+	public static String connectorOverViewPageTitle;
+	public static String deploymentPageTitle;
+	public static String namingFormPageTitle;
+	public static String securityPageTitle;
+	public static String webGeneralPageTitle;
+	public static String editorTabGeneral;
+	public static String editorTabNaming;
+	public static String editorTabSecurity;
+	public static String editorTabDeployment;
+	public static String editorTabSource;
+	public static String errorCouldNotOpenFile;
+	public static String editorTitle;
+	public static String editorSectionGeneralTitle;
+	public static String editorSectionGeneralDescription;
+	public static String editorConfigId;
+	public static String editorParentId;
+	public static String editorContextRoot;
+	public static String editorClassloader;
+	public static String editorClassloaderServer;
+	public static String editorClassloaderWebApp;
+	public static String securityRealmName;
+	//
+	public static String editorSectionSecurityRolesTitle;
+	public static String editorSectionSecurityRolesDescription;
+	public static String name;
+	public static String description;
+	//
+	public static String editorSectionDependenciesTitle;
+	public static String editorSectionDependenciesDescription;
+	//
+	public static String editorSectionImportTitle;
+	public static String editorSectionImportDescription;
+	//
+	public static String editorSectionGBeanTitle;
+	public static String editorSectionGBeanDescription;
+	public static String className;
+	public static String GbeanName;
+	//
+	public static String editorResourceRefDescription;
+	public static String editorResourceRefTitle;
+	public static String editorResRefTargetNameTitle;
+	public static String editorResRefLinkTitle;
+	public static String editorResRefNameTitle;
+	//
+	public static String editorGBeanRefTitle;
+	public static String editorGBeanRefDescription;
+	public static String editorGBeanRefName;
+	public static String editorGBeanRefType;
+	public static String editorGBeanRefTargetName;
+	public static String editorGBeanRefProxyType;
+	//
+	public static String editorServiceRefDescription;
+	public static String editorServiceRefTitle;
+	public static String editorServiceRefName;
+	//
+	public static String editorResourceEnvRefDescription;
+	public static String editorResourceEnvRefTitle;
+	public static String editorResEnvRefMsgDestTitle;
+	public static String editorResEnvRefNameTitle;
+	//
+	public static String editorEjbLocalRefDescription;
+	public static String editorEjbLocalRefTitle;
+	public static String editorEjbRefTargetName;
+	public static String editorEjbRefEjbLink;
+	//
+	public static String editorEjbRefDescription;
+	public static String editorEjbRefTitle;
+	// Buttons
+	public static String add;
+	public static String remove;
+	public static String edit;
+	// Wizard/Wizard Pages
+	public static String wizardNewTitle_ResRef;
+	public static String wizardEditTitle_ResRef;
+	public static String wizardPageTitle_ResRef;
+	public static String wizardPageDescription_ResRef;
+	//
+	public static String wizardNewTitle_GBeanRef;
+	public static String wizardEditTitle_GBeanRef;
+	public static String wizardPageTitle_GBeanRef;
+	public static String wizardPageDescription_GBeanRef;
+	//
+	public static String wizardNewTitle_ServiceRef;
+	public static String wizardEditTitle_ServiceRef;
+	public static String wizardPageTitle_ServiceRef;
+	public static String wizardPageDescription_ServiceRef;
+	//
+	public static String wizardNewTitle_ResEnvRef;
+	public static String wizardEditTitle_ResEnvRef;
+	public static String wizardPageTitle_ResEnvRef;
+	public static String wizardPageDescription_ResEnvRef;
+	//
+	public static String wizardNewTitle_EjbRef;
+	public static String wizardEditTitle_EjbRef;
+	public static String wizardPageTitle_EjbRef;
+	public static String wizardPageDescription_EjbRef;
+	//
+	public static String wizardNewTitle_EjbLocalRef;
+	public static String wizardEditTitle_EjbLocalRef;
+	public static String wizardPageTitle_EjbLocalRef;
+	public static String wizardPageDescription_EjbLocalRef;
+	//
+	public static String wizardNewTitle_Dependency;
+	public static String wizardEditTitle_Dependency;
+	public static String wizardPageTitle_Dependency;
+	public static String wizardPageDescription_Dependency;
+	public static String dependencyGroupLabel;
+	public static String serverRepos;
+	public static String uri;
+	public static String mavenArtifact;
+	public static String groupId;
+	public static String artifactId;
+	public static String version;
+	//
+	public static String wizardNewTitle_Import;
+	public static String wizardEditTitle_Import;
+	public static String wizardPageTitle_Import;
+	public static String wizardPageDescription_Import;
+	//
+	public static String wizardNewTitle_GBean;
+	public static String wizardEditTitle_GBean;
+	public static String wizardPageTitle_GBean;
+	public static String wizardPageDescription_GBean;
+	//
+	public static String wizardNewTitle_SecurityRole;
+	public static String wizardEditTitle_SecurityRole;
+	public static String wizardPageTitle_SecurityRole;
+	public static String wizardPageDescription_SecurityRole;
+	public static String editorSectionSecurityTitle;
+	public static String editorSectionSecurityDescription;
+	public static String editorSectionPortsTitle;
+	public static String editorSectionPortsDescription;
+	public static String editorSectionLogLevelTitle;
+	public static String editorSectionLogLevelDescription;
+	public static String info;
+	public static String debug;
+	public static String httpPort;
+	public static String rmiPort;
+	public static String username;
+	public static String password;
+	public static String console;
+	public static String consoleTooltip;
+	public int i;
+	//
+	public static String doasCurrentCaller;
+	public static String useContextHandler;
+	public static String defaultRole;
+
+	// GeronimoServerRuntimeWizardFragment
+	public static String serverWizardDescription;
+	public static String browse;
+	public static String installDir;
+	public static String downloadOptions;
+	public static String chooseWebContainer;
+	public static String gWithTomcat;
+	public static String gWithJetty;
+	public static String install;
+	public static String jvmWarning;
+	public static String installTitle;
+	public static String installMessage;
+	public static String tooltipLoc;
+	public static String tooltipInstall;
+	public static String tooltipJetty;
+	public static String tooltipTomcat;
+
+	static {
+		NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
+	}
+}
\ No newline at end of file

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties Wed Apr 12 13:02:48 2006
@@ -0,0 +1,173 @@
+appGeneralPageTitle=Application Plan General Configuration
+connectorOverViewPageTitle=Connector Plan General Configuration
+deploymentPageTitle=Deployment Configuration
+namingFormPageTitle=Defined References
+securityPageTitle=Security Configuration
+webGeneralPageTitle=Web Deployment Plan General Configuration
+
+errorCouldNotOpenFile=Could not open file
+
+editorTitle=Geronimo Deployment Plan Editor
+editorSectionGeneralTitle=General
+editorSectionGeneralDescription=Edit the common deployment settings.
+
+editorSectionSecurityRolesTitle=Security Roles
+editorSectionSecurityRolesDescription=The following security roles are defined:
+
+editorSectionDependenciesTitle=Dependencies
+editorSectionDependenciesDescription=The following dependencies are defined as common libraries.
+
+editorSectionImportTitle=Imports
+editorSectionImportDescription=The following configurations are imported into this plan.
+
+editorSectionGBeanTitle=GBeans
+editorSectionGBeanDescription=The following gbeans are defined in this plan.
+className=Class
+GbeanName=Gbean Name
+
+editorSectionSecurityTitle=Security
+editorSectionSecurityDescription=Specify the security settings.
+username=User ID:
+password=Password:
+
+editorSectionPortsTitle=Port Configuration
+editorSectionPortsDescription=Specify the ports for this server instance.
+httpPort=HTTP Port:
+rmiPort=RMI Naming Port:
+
+editorSectionLogLevelTitle=Console Output
+editorSectionLogLevelDescription=Select the server console output log level.
+info=INFO
+debug=DEBUG
+
+editorConfigId=Config Id:
+editorParentId=Parent Id:
+editorContextRoot=Context Root:
+securityRealmName=Security realm name:
+editorClassloader=Search order used by the classloader to locate classes:
+editorClassloaderServer=Search the Geronimo server environment first (recomended)
+editorClassloaderWebApp=Search the web app first
+
+editorResourceRefTitle=Resource References
+editorResourceRefDescription=The following resource references are defined:
+editorResRefTargetNameTitle=Target Name
+editorResRefLinkTitle=Resource Link
+editorResRefNameTitle=Reference Name
+
+editorResourceEnvRefTitle=Resource Environment References
+editorResourceEnvRefDescription=The following resource environment references are defined:
+editorResEnvRefNameTitle=Reference Name
+editorResEnvRefMsgDestTitle=Message destination
+
+editorGBeanRefTitle=GBean References
+editorGBeanRefDescription=The following gbean references are defined:
+editorGBeanRefName=Name
+editorGBeanRefType=Type
+editorGBeanRefTargetName=Target
+editorGBeanRefProxyType=Proxy Type
+
+editorServiceRefDescription=The following  service references are defined:
+editorServiceRefTitle=Service Refs
+editorServiceRefName=Name
+
+editorEjbRefDescription = The following ejb references are defined:
+editorEjbRefTitle = EJB References
+editorEjbRefTargetName=Target Name
+editorEjbRefEjbLink=EJB Link
+
+editorEjbLocalRefDescription=The following ejb local refererencs are defined:
+editorEjbLocalRefTitle=EJB Local References
+
+add=Add
+remove=Remove
+edit=Edit
+
+wizardNewTitle_ResRef=New Resource Reference
+wizardEditTitle_ResRef=Edit Resource Reference
+wizardPageTitle_ResRef=Resource Reference Details
+wizardPageDescription_ResRef=Provide details for this resource reference.
+    
+wizardNewTitle_ResEnvRef=New Resource Enviornment Reference
+wizardEditTitle_ResEnvRef=Edit Resource Enviornment Reference
+wizardPageTitle_ResEnvRef=Resource Enviornment Reference Details
+wizardPageDescription_ResEnvRef=Provide details for this resource enviornment reference.
+
+wizardNewTitle_EjbRef=New EJB Reference
+wizardEditTitle_EjbRef=Edit EJB Reference
+wizardPageTitle_EjbRef=EJB Reference Details
+wizardPageDescription_EjbRef=Provide details for this ejb reference.
+
+wizardNewTitle_ServiceRef=New Service Reference
+wizardEditTitle_ServiceRef=Edit Service Reference
+wizardPageTitle_ServiceRef=Service Reference Details
+wizardPageDescription_ServiceRef=Provide details for this service reference
+
+wizardNewTitle_EjbLocalRef=New EJB Local Reference
+wizardEditTitle_EjbLocalRef=Edit EJB Local Reference
+wizardPageTitle_EjbLocalRef=EJB Reference Local Details
+wizardPageDescription_EjbLocalRef=Provide details for this ejb local reference.
+
+wizardNewTitle_GBeanRef=New GBean Reference
+wizardEditTitle_GBeanRef=Edit GBean Reference
+wizardPageTitle_GBeanRef=GBean Reference Details
+wizardPageDescription_GBeanRef=Provide details for this gbean reference.
+
+wizardNewTitle_SecurityRole=New Security Role
+wizardEditTitle_SecurityRole=Edit Security Role
+wizardPageTitle_SecurityRole=Security Role Details
+wizardPageDescription_SecurityRole=Provide details for this security role.
+
+wizardNewTitle_Dependency=New Dependency
+wizardEditTitle_Dependency=Edit Dependency
+wizardPageTitle_Dependency=Dependency Details
+wizardPageDescription_Dependency=Provide details for this dependency.
+
+wizardNewTitle_Import=New Import
+wizardEditTitle_Import=Edit Import
+wizardPageTitle_Import=Import Details
+wizardPageDescription_Import=Provide details for this dependency.
+
+wizardNewTitle_GBean=New GBean
+wizardEditTitle_GBean=Edit Gbean
+wizardPageTitle_GBean=Gbean Details
+wizardPageDescription_GBean=Provide details for this gbean.
+
+doasCurrentCaller=Do as current caller
+useContextHandler=Use context handler
+defaultRole=Default Role:
+
+dependencyGroupLabel=Dependency type and location    
+serverRepos=Specify dependency by path    
+uri=URI:
+mavenArtifact=Specify Maven-style dependency
+groupId=Group Id:
+artifactId=Artifact Id:
+version=Version:
+
+editorTabGeneral=General
+editorTabNaming=Naming
+editorTabSecurity=Security
+editorTabDeployment=Deployment
+editorTabSource=Source
+
+name=Name
+description=Description
+
+console=Geronimo Console
+consoleTooltip=Apache Geronimo Console
+
+serverWizardDescription=Specify the location of an existing 1.0 Geronimo installation.  If none exists, specify an install location and press 'Download and Install'.
+browse=Browse
+installDir=Application Server Installation Directory:
+downloadOptions=Download Options
+chooseWebContainer=Select a web container:
+gWithTomcat=Geronimo with Tomcat
+gWithJetty=Geronimo with Jetty
+install=Download and Install
+jvmWarning=Geronimo is currently only certified on a 1.4 JVM. Use of any other version is not currently supported.
+installTitle=Install Confirmation
+installMessage=Install Apache Geronimo to {0} ?
+tooltipLoc=A location of an existing Geronimo installation or a path to install to.
+tooltipInstall=Downloads the selected Geronimo distribution and installs it to the specified location.
+tooltipJetty=Selects the Jetty distribution of Geronimo to install.
+tooltipTomcat=Selects the Tomcat distribution of Geronimo to install.
\ No newline at end of file

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Trace.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Trace.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Trace.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Trace.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,77 @@
+/**
+ * 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.internal;
+
+import org.apache.geronimo.st.v1.ui.Activator;
+
+/**
+ * Helper class to route trace output.
+ */
+public class Trace {
+
+	/**
+	 * Finest trace event.
+	 */
+	public static byte INFO = 0;
+
+	/**
+	 * Warning trace event.
+	 */
+	public static byte WARNING = 1;
+
+	/**
+	 * Severe trace event.
+	 */
+	public static byte SEVERE = 2;
+
+	/**
+	 * Trace constructor comment.
+	 */
+	private Trace() {
+		super();
+	}
+
+	/**
+	 * Trace the given text.
+	 * 
+	 * @param level
+	 *            the trace level
+	 * @param s
+	 *            a message
+	 */
+	public static void trace(byte level, String s) {
+		trace(level, s, null);
+	}
+
+	/**
+	 * Trace the given message and exception.
+	 * 
+	 * @param level
+	 *            the trace level
+	 * @param s
+	 *            a message
+	 * @param t
+	 *            a throwable
+	 */
+	public static void trace(byte level, String s, Throwable t) {
+		if (!Activator.getDefault().isDebugging())
+			return;
+
+		System.out.println(Activator.PLUGIN_ID + ":  " + s);
+		if (t != null)
+			t.printStackTrace();
+	}
+}
\ No newline at end of file

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Trace.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Trace.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Trace.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java?rev=393587&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java Wed Apr 12 13:02:48 2006
@@ -0,0 +1,61 @@
+/**
+ * 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.pages;
+
+import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v1.ui.internal.Messages;
+import org.apache.geronimo.st.v1.ui.sections.AppGeneralSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+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)
+	 * 
+	 * @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 Messages.appGeneralPageTitle;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain