Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 79955 invoked from network); 2 Nov 2005 18:39:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Nov 2005 18:39:04 -0000 Received: (qmail 87279 invoked by uid 500); 2 Nov 2005 18:39:03 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 87264 invoked by uid 500); 2 Nov 2005 18:39:03 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 87253 invoked by uid 99); 2 Nov 2005 18:39:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2005 10:39:03 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 02 Nov 2005 10:38:58 -0800 Received: (qmail 79646 invoked by uid 65534); 2 Nov 2005 18:38:42 -0000 Message-ID: <20051102183842.79645.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r330313 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui: editors/ internal/ pages/ sections/ wizards/ Date: Wed, 02 Nov 2005 18:38:40 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Wed Nov 2 10:38:35 2005 New Revision: 330313 URL: http://svn.apache.org/viewcvs?rev=330313&view=rev Log: add simple stubbed out service ref sec Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.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=330313&r1=330312&r2=330313&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:38:35 2005 @@ -59,7 +59,8 @@ formPage.ejbRef = pkg.getWebAppType_EjbRef(); formPage.resEnvRef = pkg.getWebAppType_ResourceEnvRef(); formPage.resRef = pkg.getWebAppType_ResourceRef(); - formPage.gbeanRef = pkg.getWebAppType_GbeanRef();; + formPage.gbeanRef = pkg.getWebAppType_GbeanRef(); + formPage.serviceRef = pkg.getWebAppType_ServiceRef(); 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=330313&r1=330312&r2=330313&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:38:35 2005 @@ -114,6 +114,14 @@ // + public static String editorServiceRefDescription; + + public static String editorServiceRefTitle; + + public static String editorServiceRefName; + + // + public static String editorResourceEnvRefDescription; public static String editorResourceEnvRefTitle; @@ -166,6 +174,16 @@ 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; 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=330313&r1=330312&r2=330313&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:38:35 2005 @@ -49,6 +49,10 @@ 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 @@ -75,6 +79,11 @@ 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 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=330313&r1=330312&r2=330313&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:38:35 2005 @@ -20,6 +20,7 @@ import org.apache.geronimo.ui.sections.GBeanRefSection; import org.apache.geronimo.ui.sections.ResourceEnvRefSection; import org.apache.geronimo.ui.sections.ResourceRefSection; +import org.apache.geronimo.ui.sections.ServiceRefSection; import org.eclipse.emf.ecore.EReference; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.editor.FormEditor; @@ -35,6 +36,8 @@ public EReference ejbLocalRef; public EReference gbeanRef; + + public EReference serviceRef; public NamingFormPage(FormEditor editor, String id, String title) { super(editor, id, title); @@ -54,6 +57,7 @@ managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbRef)); managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbLocalRef)); managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), gbeanRef)); + managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), serviceRef)); } } Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java?rev=330313&view=auto ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java (added) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java Wed Nov 2 10:38:35 2005 @@ -0,0 +1,91 @@ +/** + * 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.ServiceRefWizard; +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 ServiceRefSection extends DynamicTableSection { + + EReference serviceRefERef; + + public ServiceRefSection(EObject plan, Composite parent, + FormToolkit toolkit, int style, EReference serviceRefERef) { + super(plan, parent, toolkit, style); + this.serviceRefERef = serviceRefERef; + create(); + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTitle() + */ + public String getTitle() { + return Messages.editorServiceRefTitle; + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.sections.DynamicTableSection#getDescription() + */ + public String getDescription() { + return Messages.editorServiceRefDescription; + } + + /* (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 serviceRefERef; + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnNames() + */ + public String[] getTableColumnNames() { + return new String[] { Messages.editorServiceRefName}; + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes() + */ + public EAttribute[] getTableColumnEAttributes() { + return new EAttribute[] { + NamingPackage.eINSTANCE.getServiceRefType_ServiceRefName()}; + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.sections.DynamicTableSection#getWizard() + */ + public Wizard getWizard() { + return new ServiceRefWizard(this); + } + +} Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java?rev=330313&view=auto ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java (added) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java Wed Nov 2 10:38:35 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 ServiceRefWizard extends DynamicAddEditWizard { + + /** + * @param section + */ + public ServiceRefWizard(DynamicTableSection section) { + super(section); + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle() + */ + public String getAddWizardWindowTitle() { + return Messages.wizardNewTitle_ServiceRef; + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle() + */ + public String getEditWizardWindowTitle() { + return Messages.wizardEditTitle_ServiceRef; + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle() + */ + public String getWizardFirstPageTitle() { + return Messages.wizardPageTitle_ServiceRef; + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription() + */ + public String getWizardFirstPageDescription() { + return Messages.wizardPageDescription_ServiceRef; + } + +}