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 2005/10/20 16:35:49 UTC
svn commit: r326913 - in
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui:
editors/ internal/ pages/ sections/ wizards/
Author: sppatel
Date: Thu Oct 20 07:35:39 2005
New Revision: 326913
URL: http://svn.apache.org/viewcvs?rev=326913&view=rev
Log:
add dependencies tab
Added:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ApplicationPlanEditor.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ConnectorPlanEditor.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/OpenEjbPlanEditor.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.properties
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ApplicationPlanEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ApplicationPlanEditor.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ApplicationPlanEditor.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ApplicationPlanEditor.java Thu Oct 20 07:35:39 2005
@@ -18,11 +18,14 @@
import org.apache.geronimo.core.internal.GeronimoUtils;
import org.apache.geronimo.ui.internal.Messages;
import org.apache.geronimo.ui.pages.AppGeneralPage;
+import org.apache.geronimo.ui.pages.DeploymentPage;
import org.apache.geronimo.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 {
@@ -30,23 +33,39 @@
super();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
*/
public void doAddPages() throws PartInitException {
addPage(new AppGeneralPage(this, "appgeneralpage",
Messages.editorTabGeneral));
addPage(new SecurityPage(this, "securitypage",
- Messages.editorTabSecurity, ApplicationPackage.eINSTANCE
- .getApplicationType_Security()));
+ Messages.editorTabSecurity, ApplicationPackage.eINSTANCE
+ .getApplicationType_Security()));
+ addPage(getDeploymentPage());
addSourcePage();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public EObject loadDeploymentPlan(IFile file) {
return GeronimoUtils.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;
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ConnectorPlanEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ConnectorPlanEditor.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ConnectorPlanEditor.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/ConnectorPlanEditor.java Thu Oct 20 07:35:39 2005
@@ -18,9 +18,13 @@
import org.apache.geronimo.core.internal.GeronimoUtils;
import org.apache.geronimo.ui.internal.Messages;
import org.apache.geronimo.ui.pages.ConnectorOverviewPage;
+import org.apache.geronimo.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 {
@@ -31,6 +35,7 @@
public void doAddPages() throws PartInitException {
addPage(new ConnectorOverviewPage(this, "connectoroverview",
Messages.editorTabGeneral));
+ addPage(getDeploymentPage());
addSourcePage();
}
@@ -41,6 +46,16 @@
*/
public EObject loadDeploymentPlan(IFile file) {
return GeronimoUtils.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;
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/OpenEjbPlanEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/OpenEjbPlanEditor.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/OpenEjbPlanEditor.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/OpenEjbPlanEditor.java Thu Oct 20 07:35:39 2005
@@ -17,12 +17,16 @@
import org.apache.geronimo.core.internal.GeronimoUtils;
import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.pages.DeploymentPage;
import org.apache.geronimo.ui.pages.EjbOverviewPage;
import org.apache.geronimo.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;
+
/**
*
*
@@ -38,11 +42,12 @@
public void doAddPages() throws PartInitException {
addPage(new EjbOverviewPage(this, "ejboverview",
- Messages.editorTabGeneral));
- //TODO Add naming page but broken down for each bean type
+ Messages.editorTabGeneral));
+ // TODO Add naming page but broken down for each bean type
addPage(new SecurityPage(this, "securitypage",
- Messages.editorTabSecurity, JarPackage.eINSTANCE
- .getOpenejbJarType_Security()));
+ Messages.editorTabSecurity, JarPackage.eINSTANCE
+ .getOpenejbJarType_Security()));
+ addPage(getDeploymentPage());
addSourcePage();
}
@@ -53,6 +58,16 @@
*/
public EObject loadDeploymentPlan(IFile file) {
return GeronimoUtils.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;
+ }
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java Thu Oct 20 07:35:39 2005
@@ -17,10 +17,12 @@
import org.apache.geronimo.core.internal.GeronimoUtils;
import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.pages.DeploymentPage;
import org.apache.geronimo.ui.pages.NamingFormPage;
import org.apache.geronimo.ui.pages.SecurityPage;
import org.apache.geronimo.ui.pages.WebGeneralPage;
import org.apache.geronimo.xml.ns.web.WebFactory;
+import org.apache.geronimo.xml.ns.web.WebPackage;
import org.apache.geronimo.xml.ns.web.impl.WebPackageImpl;
import org.eclipse.core.resources.IFile;
import org.eclipse.emf.ecore.EObject;
@@ -37,10 +39,11 @@
public void doAddPages() throws PartInitException {
addPage(new WebGeneralPage(this, "generalpage",
Messages.editorTabGeneral));
- addPage(getNamingFormPage());
+ addPage(getNamingPage());
addPage(new SecurityPage(this, "securitypage",
Messages.editorTabSecurity, WebPackageImpl.eINSTANCE
.getWebAppType_Security()));
+ addPage(getDeploymentPage());
addSourcePage();
}
@@ -48,17 +51,24 @@
return GeronimoUtils.getWebDeploymentPlan(file);
}
- private FormPage getNamingFormPage() {
+ private FormPage getNamingPage() {
NamingFormPage formPage = new NamingFormPage(this, "namingpage",
Messages.editorTabNaming);
- formPage.ejbLocalRef = WebFactory.eINSTANCE.getWebPackage()
- .getWebAppType_EjbLocalRef();
- formPage.ejbRef = WebFactory.eINSTANCE.getWebPackage()
- .getWebAppType_EjbRef();
- formPage.resEnvRef = WebFactory.eINSTANCE.getWebPackage()
- .getWebAppType_ResourceEnvRef();
- formPage.resRef = WebFactory.eINSTANCE.getWebPackage()
- .getWebAppType_ResourceRef();
+ 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();
+ 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;
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java Thu Oct 20 07:35:39 2005
@@ -28,10 +28,10 @@
public static String editorTabSecurity;
+ public static String editorTabDeployment;
+
public static String editorTabSource;
- public static String editorTabDependencies;
-
public static String errorCouldNotOpenFile;
public static String editorTitle;
@@ -77,6 +77,16 @@
public static String editorSectionImportDescription;
//
+
+ public static String editorSectionGBeanTitle;
+
+ public static String editorSectionGBeanDescription;
+
+ public static String className;
+
+ public static String GbeanName;
+
+ //
public static String editorResourceRefDescription;
@@ -194,7 +204,17 @@
public static String wizardPageTitle_Import;
- public static String wizardPageDescription_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;
//
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.properties?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.properties Thu Oct 20 07:35:39 2005
@@ -13,6 +13,11 @@
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:
@@ -84,6 +89,11 @@
wizardPageTitle_Import=Import Details
wizardPageDescription_Import=Provide the URI for the configuration to import.
+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:
@@ -99,7 +109,7 @@
editorTabGeneral=General
editorTabNaming=Naming
editorTabSecurity=Security
-editorTabDependencies=Dependencies
+editorTabDeployment=Deployment
editorTabSource=Source
name=Name
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java Thu Oct 20 07:35:39 2005
@@ -16,9 +16,6 @@
package org.apache.geronimo.ui.pages;
import org.apache.geronimo.ui.sections.AppGeneralSection;
-import org.apache.geronimo.ui.sections.DependencySection;
-import org.apache.geronimo.ui.sections.ImportSection;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -47,17 +44,8 @@
* @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()));
-
- managedForm.addPart(new DependencySection(getDeploymentPlan(),
- ApplicationPackage.eINSTANCE.getApplicationType_Dependency(),
- body, toolkit, getStyle()));
-
- managedForm.addPart(new ImportSection(getDeploymentPlan(),
- ApplicationPackage.eINSTANCE.getApplicationType_Import(), body,
- toolkit, getStyle()));
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java Thu Oct 20 07:35:39 2005
@@ -16,9 +16,6 @@
package org.apache.geronimo.ui.pages;
import org.apache.geronimo.ui.sections.ConnectorGeneralSection;
-import org.apache.geronimo.ui.sections.DependencySection;
-import org.apache.geronimo.ui.sections.ImportSection;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -45,16 +42,7 @@
* @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()));
-
- managedForm.addPart(new DependencySection(getDeploymentPlan(),
- ConnectorPackage.eINSTANCE.getConnectorType_Dependency(), body,
- toolkit, getStyle()));
-
- managedForm.addPart(new ImportSection(getDeploymentPlan(), ConnectorPackage.eINSTANCE
- .getConnectorType_Import(), body, toolkit,
- getStyle()));
}
}
Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java?rev=326913&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java Thu Oct 20 07:35:39 2005
@@ -0,0 +1,64 @@
+/**
+ * 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.ui.pages;
+
+import org.apache.geronimo.ui.sections.DependencySection;
+import org.apache.geronimo.ui.sections.GBeanSection;
+import org.apache.geronimo.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;
+
+ /**
+ * @param editor
+ * @param id
+ * @param title
+ */
+ public DeploymentPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ /**
+ * @param id
+ * @param title
+ */
+ public DeploymentPage(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 DependencySection(getDeploymentPlan(),
+ dependencies, body, toolkit, getStyle()));
+ managedForm.addPart(new ImportSection(getDeploymentPlan(), imports,
+ body, toolkit, getStyle()));
+ managedForm.addPart(new GBeanSection(getDeploymentPlan(), gbeans, body,
+ toolkit, getStyle()));
+ }
+
+}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java Thu Oct 20 07:35:39 2005
@@ -15,12 +15,9 @@
*/
package org.apache.geronimo.ui.pages;
-import org.apache.geronimo.ui.sections.DependencySection;
-import org.apache.geronimo.ui.sections.ImportSection;
import org.apache.geronimo.ui.sections.OpenEjbJarGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
-import org.openejb.xml.ns.openejb.jar.JarPackage;
public class EjbOverviewPage extends AbstractGeronimoFormPage {
@@ -47,18 +44,8 @@
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
-
managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit,
getStyle(), getDeploymentPlan()));
-
- managedForm.addPart(new DependencySection(getDeploymentPlan(),
- JarPackage.eINSTANCE.getOpenejbJarType_Dependency(), body,
- toolkit, getStyle()));
-
- managedForm.addPart(new ImportSection(getDeploymentPlan(),
- JarPackage.eINSTANCE.getOpenejbJarType_Import(), body, toolkit,
- getStyle()));
-
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java Thu Oct 20 07:35:39 2005
@@ -45,14 +45,10 @@
/* (non-Javadoc)
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
- protected void fillBody(IManagedForm managedForm) {
-
+ 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));
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java Thu Oct 20 07:35:39 2005
@@ -25,9 +25,7 @@
* @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));
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java?rev=326913&r1=326912&r2=326913&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java Thu Oct 20 07:35:39 2005
@@ -15,10 +15,7 @@
*/
package org.apache.geronimo.ui.pages;
-import org.apache.geronimo.ui.sections.DependencySection;
-import org.apache.geronimo.ui.sections.ImportSection;
import org.apache.geronimo.ui.sections.WebGeneralSection;
-import org.apache.geronimo.xml.ns.web.WebPackage;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -36,15 +33,6 @@
* @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()));
-
- managedForm.addPart(new DependencySection(getDeploymentPlan(), WebPackage.eINSTANCE
- .getWebAppType_Dependency(), body, toolkit,
- getStyle()));
-
- managedForm.addPart(new ImportSection(getDeploymentPlan(),
- WebPackage.eINSTANCE.getWebAppType_Import(), body,
- toolkit, getStyle()));
}
}
Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java?rev=326913&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java Thu Oct 20 07:35:39 2005
@@ -0,0 +1,114 @@
+/**
+ * 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.ui.sections;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.wizards.GBeanWizard;
+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.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public class GBeanSection extends DynamicTableSection {
+
+ private EReference gBeanERef;
+
+ /**
+ * @param plan
+ * @param parent
+ * @param toolkit
+ * @param style
+ */
+ public GBeanSection(EObject plan, EReference gBeanERef, Composite parent,
+ FormToolkit toolkit, int style) {
+ super(plan, parent, toolkit, style);
+ this.gBeanERef = gBeanERef;
+ create();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTitle()
+ */
+ public String getTitle() {
+ return Messages.editorSectionGBeanTitle;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getDescription()
+ */
+ public String getDescription() {
+ return Messages.editorSectionGBeanDescription;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
+ */
+ public EFactory getEFactory() {
+ return DeploymentFactory.eINSTANCE;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
+ */
+ public EReference getEReference() {
+ return gBeanERef;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnNames()
+ */
+ public String[] getTableColumnNames() {
+ return new String[] { Messages.name, Messages.GbeanName,
+ Messages.className };
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
+ */
+ public EAttribute[] getTableColumnEAttributes() {
+ return new EAttribute[] {
+ DeploymentPackage.eINSTANCE.getGbeanType_Name(),
+ DeploymentPackage.eINSTANCE.getGbeanType_GbeanName(),
+ DeploymentPackage.eINSTANCE.getGbeanType_Class() };
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getWizard()
+ */
+ public Wizard getWizard() {
+ return new GBeanWizard(this);
+ }
+
+}
Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java?rev=326913&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java Thu Oct 20 07:35:39 2005
@@ -0,0 +1,58 @@
+/**
+ * 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.ui.wizards;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.sections.DynamicTableSection;
+
+public class GBeanWizard extends DynamicAddEditWizard {
+
+ /**
+ * @param section
+ */
+ public GBeanWizard(DynamicTableSection section) {
+ super(section);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
+ */
+ public String getAddWizardWindowTitle() {
+ return Messages.wizardNewTitle_GBean;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
+ */
+ public String getEditWizardWindowTitle() {
+ return Messages.wizardEditTitle_GBean;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
+ */
+ public String getWizardFirstPageTitle() {
+ return Messages.wizardEditTitle_GBean;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
+ */
+ public String getWizardFirstPageDescription() {
+ return Messages.wizardPageTitle_GBean;
+ }
+
+}