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/11/02 19:02:57 UTC
svn commit: r330297 - 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: Wed Nov 2 10:02:52 2005
New Revision: 330297
URL: http://svn.apache.org/viewcvs?rev=330297&view=rev
Log:
add gbeanref section
Added:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java
Modified:
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/NamingFormPage.java
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=330297&r1=330296&r2=330297&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 Wed Nov 2 10:02:52 2005
@@ -59,6 +59,7 @@
formPage.ejbRef = pkg.getWebAppType_EjbRef();
formPage.resEnvRef = pkg.getWebAppType_ResourceEnvRef();
formPage.resRef = pkg.getWebAppType_ResourceRef();
+ formPage.gbeanRef = pkg.getWebAppType_GbeanRef();;
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=330297&r1=330296&r2=330297&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 Wed Nov 2 10:02:52 2005
@@ -22,232 +22,256 @@
*/
public class Messages extends NLS {
- public static String editorTabGeneral;
+ public static String editorTabGeneral;
- public static String editorTabNaming;
+ public static String editorTabNaming;
- public static String editorTabSecurity;
-
- public static String editorTabDeployment;
-
- public static String editorTabSource;
+ public static String editorTabSecurity;
- public static String errorCouldNotOpenFile;
+ public static String editorTabDeployment;
- public static String editorTitle;
+ public static String editorTabSource;
- public static String editorSectionGeneralTitle;
+ public static String errorCouldNotOpenFile;
- public static String editorSectionGeneralDescription;
+ public static String editorTitle;
- public static String editorConfigId;
+ public static String editorSectionGeneralTitle;
- public static String editorParentId;
+ public static String editorSectionGeneralDescription;
- public static String editorContextRoot;
+ public static String editorConfigId;
- public static String editorClassloader;
+ public static String editorParentId;
- public static String editorClassloaderServer;
+ public static String editorContextRoot;
- public static String editorClassloaderWebApp;
+ public static String editorClassloader;
- public static String securityRealmName;
+ public static String editorClassloaderServer;
- //
+ public static String editorClassloaderWebApp;
- public static String editorSectionSecurityRolesTitle;
+ public static String securityRealmName;
- public static String editorSectionSecurityRolesDescription;
+ //
- public static String name;
+ public static String editorSectionSecurityRolesTitle;
- public static String description;
-
- //
-
- public static String editorSectionDependenciesTitle;
+ public static String editorSectionSecurityRolesDescription;
- public static String editorSectionDependenciesDescription;
-
- //
-
- public static String editorSectionImportTitle;
+ public static String name;
- public static String editorSectionImportDescription;
-
- //
-
- public static String editorSectionGBeanTitle;
+ public static String description;
- public static String editorSectionGBeanDescription;
-
- public static String className;
-
- public static String GbeanName;
-
- //
+ //
- public static String editorResourceRefDescription;
+ public static String editorSectionDependenciesTitle;
- public static String editorResourceRefTitle;
+ public static String editorSectionDependenciesDescription;
- public static String editorResRefTargetNameTitle;
+ //
- public static String editorResRefLinkTitle;
+ public static String editorSectionImportTitle;
- public static String editorResRefNameTitle;
+ public static String editorSectionImportDescription;
- //
+ //
- public static String editorResourceEnvRefDescription;
+ public static String editorSectionGBeanTitle;
- public static String editorResourceEnvRefTitle;
+ public static String editorSectionGBeanDescription;
- public static String editorResEnvRefMsgDestTitle;
+ public static String className;
- public static String editorResEnvRefNameTitle;
+ public static String GbeanName;
- //
+ //
- public static String editorEjbLocalRefDescription;
+ public static String editorResourceRefDescription;
- public static String editorEjbLocalRefTitle;
+ public static String editorResourceRefTitle;
- public static String editorEjbRefTargetName;
+ public static String editorResRefTargetNameTitle;
- public static String editorEjbRefEjbLink;
+ public static String editorResRefLinkTitle;
- //
+ public static String editorResRefNameTitle;
- public static String editorEjbRefDescription;
+ //
- public static String editorEjbRefTitle;
+ public static String editorGBeanRefTitle;
- // Buttons
+ public static String editorGBeanRefDescription;
- public static String add;
+ public static String editorGBeanRefName;
- public static String remove;
+ public static String editorGBeanRefType;
- public static String edit;
+ public static String editorGBeanRefTargetName;
- // Wizard/Wizard Pages
+ public static String editorGBeanRefProxyType;
- public static String wizardNewTitle_ResRef;
+ //
- public static String wizardEditTitle_ResRef;
+ public static String editorResourceEnvRefDescription;
- public static String wizardPageTitle_ResRef;
+ public static String editorResourceEnvRefTitle;
- public static String wizardPageDescription_ResRef;
+ public static String editorResEnvRefMsgDestTitle;
- //
+ public static String editorResEnvRefNameTitle;
- public static String wizardNewTitle_ResEnvRef;
+ //
- public static String wizardEditTitle_ResEnvRef;
+ public static String editorEjbLocalRefDescription;
- public static String wizardPageTitle_ResEnvRef;
+ public static String editorEjbLocalRefTitle;
- public static String wizardPageDescription_ResEnvRef;
+ public static String editorEjbRefTargetName;
- //
+ public static String editorEjbRefEjbLink;
- public static String wizardNewTitle_EjbRef;
+ //
- public static String wizardEditTitle_EjbRef;
+ public static String editorEjbRefDescription;
- public static String wizardPageTitle_EjbRef;
+ public static String editorEjbRefTitle;
- public static String wizardPageDescription_EjbRef;
+ // Buttons
- //
+ public static String add;
- public static String wizardNewTitle_EjbLocalRef;
+ public static String remove;
- public static String wizardEditTitle_EjbLocalRef;
+ public static String edit;
- public static String wizardPageTitle_EjbLocalRef;
+ // Wizard/Wizard Pages
- public static String wizardPageDescription_EjbLocalRef;
+ public static String wizardNewTitle_ResRef;
- //
+ public static String wizardEditTitle_ResRef;
- public static String wizardNewTitle_Dependency;
+ public static String wizardPageTitle_ResRef;
- public static String wizardEditTitle_Dependency;
+ public static String wizardPageDescription_ResRef;
+
+ //
+
+ public static String wizardNewTitle_GBeanRef;
- public static String wizardPageTitle_Dependency;
+ public static String wizardEditTitle_GBeanRef;
- 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 wizardPageTitle_GBeanRef;
- //
-
- public static String wizardNewTitle_Import;
+ public static String wizardPageDescription_GBeanRef;
- public static String wizardEditTitle_Import;
+ //
- public static String wizardPageTitle_Import;
+ public static String wizardNewTitle_ResEnvRef;
- public static String wizardPageDescription_Import;
-
- //
-
- public static String wizardNewTitle_GBean;
+ public static String wizardEditTitle_ResEnvRef;
- public static String wizardEditTitle_GBean;
+ public static String wizardPageTitle_ResEnvRef;
- public static String wizardPageTitle_GBean;
+ public static String wizardPageDescription_ResEnvRef;
- public static String wizardPageDescription_GBean;
-
- //
+ //
- public static String wizardNewTitle_SecurityRole;
+ public static String wizardNewTitle_EjbRef;
- public static String wizardEditTitle_SecurityRole;
+ public static String wizardEditTitle_EjbRef;
- public static String wizardPageTitle_SecurityRole;
+ public static String wizardPageTitle_EjbRef;
- public static String wizardPageDescription_SecurityRole;
+ public static String wizardPageDescription_EjbRef;
- public static String editorSectionSecurityTitle;
+ //
- public static String editorSectionSecurityDescription;
+ public static String wizardNewTitle_EjbLocalRef;
- public static String username;
+ public static String wizardEditTitle_EjbLocalRef;
- public static String password;
-
- public static String console;
-
- public static String consoleTooltip;
-
- //
-
- public static String doasCurrentCaller;
-
- public static String useContextHandler;
-
- public static String defaultRole;
+ public static String wizardPageTitle_EjbLocalRef;
- static {
- NLS.initializeMessages(GeronimoUIPlugin.PLUGIN_ID
- + ".internal.Messages", Messages.class);
- }
+ 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 username;
+
+ public static String password;
+
+ public static String console;
+
+ public static String consoleTooltip;
+
+ //
+
+ public static String doasCurrentCaller;
+
+ public static String useContextHandler;
+
+ public static String defaultRole;
+
+ static {
+ NLS.initializeMessages(GeronimoUIPlugin.PLUGIN_ID
+ + ".internal.Messages", Messages.class);
+ }
}
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=330297&r1=330296&r2=330297&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 Wed Nov 2 10:02:52 2005
@@ -42,6 +42,13 @@
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
+
editorEjbRefDescription = The following ejb references are defined:
editorEjbRefTitle = EJB References
editorEjbRefTargetName=Target Name
@@ -73,6 +80,11 @@
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
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=330297&r1=330296&r2=330297&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 Wed Nov 2 10:02:52 2005
@@ -17,6 +17,7 @@
import org.apache.geronimo.ui.sections.EjbLocalRefSection;
import org.apache.geronimo.ui.sections.EjbRefSection;
+import org.apache.geronimo.ui.sections.GBeanRefSection;
import org.apache.geronimo.ui.sections.ResourceEnvRefSection;
import org.apache.geronimo.ui.sections.ResourceRefSection;
import org.eclipse.emf.ecore.EReference;
@@ -32,6 +33,8 @@
public EReference ejbRef;
public EReference ejbLocalRef;
+
+ public EReference gbeanRef;
public NamingFormPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -50,6 +53,7 @@
managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resEnvRef));
managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbRef));
managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbLocalRef));
+ managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), gbeanRef));
}
}
Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java?rev=330297&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java Wed Nov 2 10:02:52 2005
@@ -0,0 +1,96 @@
+/**
+ * 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.GBeanRefWizard;
+import org.apache.geronimo.xml.ns.naming.NamingFactory;
+import org.apache.geronimo.xml.ns.naming.NamingPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
+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 GBeanRefSection extends DynamicTableSection {
+
+ EReference gbeanERef;
+
+ public GBeanRefSection(EObject plan, Composite parent,
+ FormToolkit toolkit, int style, EReference gbeanERef) {
+ super(plan, parent, toolkit, style);
+ this.gbeanERef = gbeanERef;
+ create();
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTitle()
+ */
+ public String getTitle() {
+ return Messages.editorGBeanRefTitle;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getDescription()
+ */
+ public String getDescription() {
+ return Messages.editorGBeanRefDescription;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
+ */
+ public EFactory getEFactory() {
+ return NamingFactory.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.editorGBeanRefName,
+ Messages.editorGBeanRefType, Messages.editorGBeanRefTargetName,
+ Messages.editorGBeanRefProxyType };
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
+ */
+ public EAttribute[] getTableColumnEAttributes() {
+ return new EAttribute[] {
+ NamingPackage.eINSTANCE.getGbeanRefType_RefName(),
+ NamingPackage.eINSTANCE.getGbeanRefType_RefType(),
+ NamingPackage.eINSTANCE.getGbeanRefType_TargetName(),
+ NamingPackage.eINSTANCE.getGbeanRefType_ProxyType()};
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getWizard()
+ */
+ public Wizard getWizard() {
+ return new GBeanRefWizard(this);
+ }
+
+}
Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java?rev=330297&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java Wed Nov 2 10:02:52 2005
@@ -0,0 +1,55 @@
+/**
+ * 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 GBeanRefWizard extends DynamicAddEditWizard {
+
+ public GBeanRefWizard(DynamicTableSection section) {
+ super(section);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
+ */
+ public String getAddWizardWindowTitle() {
+ return Messages.wizardNewTitle_GBeanRef;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
+ */
+ public String getEditWizardWindowTitle() {
+ return Messages.wizardEditTitle_GBeanRef;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
+ */
+ public String getWizardFirstPageTitle() {
+ return Messages.wizardPageTitle_GBeanRef;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
+ */
+ public String getWizardFirstPageDescription() {
+ return Messages.wizardPageDescription_GBeanRef;
+ }
+
+}