You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by tk...@apache.org on 2008/10/07 20:30:46 UTC
svn commit: r702576 - in /geronimo/devtools/eclipse-plugin/branches/2.1.4: ./
plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/
plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/
plugin...
Author: tkirby
Date: Tue Oct 7 11:30:46 2008
New Revision: 702576
URL: http://svn.apache.org/viewvc?rev=702576&view=rev
Log:
Fix for GERONIMODEVTOOLS-379. Added GUI support for modifying the C-M-P Connection Factory data in the EJB Deployment Plan Editor main page.
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1.4/ (props changed)
geronimo/devtools/eclipse-plugin/branches/2.1.4/PLUGIN_RELEASE-NOTES-2.1.4.txt (props changed)
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
Propchange: geronimo/devtools/eclipse-plugin/branches/2.1.4/
------------------------------------------------------------------------------
svn:mergeinfo = /geronimo/devtools/eclipse-plugin/trunk:700249
Propchange: geronimo/devtools/eclipse-plugin/branches/2.1.4/PLUGIN_RELEASE-NOTES-2.1.4.txt
('svn:mergeinfo' removed)
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java?rev=702576&r1=702575&r2=702576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/MarshallerListener.java Tue Oct 7 11:30:46 2008
@@ -20,6 +20,8 @@
import org.apache.geronimo.jee.naming.GbeanLocator;
import org.apache.geronimo.jee.naming.Pattern;
+import org.apache.geronimo.jee.naming.ResourceLocator;
+import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.jee.security.Security;
import org.apache.geronimo.jee.web.WebApp;
@@ -38,6 +40,12 @@
if (gbeanlocator != null && isEmpty(gbeanlocator.getGbeanLink()) && isEmpty(gbeanlocator.getPattern())) {
webapp.setWebContainer(null);
}
+ } else if (source instanceof OpenejbJar) {
+ OpenejbJar openejb = (OpenejbJar)source;
+ ResourceLocator locator = openejb.getCmpConnectionFactory();
+ if (locator != null && isEmpty(locator.getResourceLink()) && isEmpty(locator.getUrl()) && isEmpty(locator.getPattern())) {
+ openejb.setCmpConnectionFactory(null);
+ }
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java?rev=702576&r1=702575&r2=702576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java Tue Oct 7 11:30:46 2008
@@ -325,10 +325,18 @@
public static String inverseClassloading;
public static String supressDefaultEnv;
public static String sharedLibDepends;
+
+ public static String useResourceLink;
+ public static String useUrl;
+ public static String useResourcePattern;
+ public static String resourceLink;
+ public static String url;
public static String addSharedLib;
public static String webContainerSection;
public static String webContainerSectionDescription;
+ public static String cmpConnectionSection;
+ public static String cmpConnectionSectionDescription;
public static String moduleType;
public static String path;
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties?rev=702576&r1=702575&r2=702576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties Tue Oct 7 11:30:46 2008
@@ -334,6 +334,14 @@
useGBeanPattern=Specify as GBean Pattern
moduleId=Module Id:
+cmpConnectionSection=C-M-P Connection Factory
+cmpConnectionSectionDescription=C-M-P Connection Factory Configuration
+useResourceLink=Specify as Resource Link
+resourceLink=Resource Link:
+useUrl=Specify as URL
+url=URL:
+useResourcePattern=Specify as Resource Pattern
+
moduleType=Module Type
path=Path
internalPath=Internal Path
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java?rev=702576&r1=702575&r2=702576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java Tue Oct 7 11:30:46 2008
@@ -16,8 +16,6 @@
*/
package org.apache.geronimo.st.v21.ui.pages;
-import java.util.List;
-
import org.apache.geronimo.jee.application.Application;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java?rev=702576&r1=702575&r2=702576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java Tue Oct 7 11:30:46 2008
@@ -18,6 +18,7 @@
import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarCMPSection;
import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -27,22 +28,22 @@
*/
public class EjbOverviewPage extends AbstractGeronimoFormPage {
- public EjbOverviewPage(FormEditor editor, String id, String title) {
- super(editor, id, title);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
- */
- protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
- }
+ public EjbOverviewPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+ */
+ protected void fillBody(IManagedForm managedForm) {
+ managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new OpenEjbJarCMPSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ }
@Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
-
+ protected void triggerGeronimoServerInfoUpdate() {
+ GeronimoServerInfo.getInstance().updateInfo();
+ }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java?rev=702576&r1=702575&r2=702576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java Tue Oct 7 11:30:46 2008
@@ -16,8 +16,6 @@
*/
package org.apache.geronimo.st.v21.ui.pages;
-import java.util.List;
-
import org.apache.geronimo.jee.applicationclient.ApplicationClient;
import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.jee.web.WebApp;
@@ -41,44 +39,8 @@
*/
public class NamingFormPage extends AbstractGeronimoFormPage {
- public List resRefs;
-
- public List resEnvRefs;
-
- public List ejbRefs;
-
- public List ejbLocalRefs;
-
- public List gbeanRefs;
-
- public List serviceRefs;
-
- public List messageDestinations;
-
public NamingFormPage(FormEditor editor, String id, String title) {
super(editor, id, title);
- if (WebApp.class.isInstance (((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue())) {
- WebApp webapp = (WebApp)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- resRefs = webapp.getResourceRef();
- resEnvRefs = webapp.getResourceEnvRef();
- ejbRefs = webapp.getEjbRef();
- ejbLocalRefs = webapp.getEjbLocalRef();
- serviceRefs = webapp.getServiceRef();
- messageDestinations = webapp.getMessageDestination();
- }
- else if (ApplicationClient.class.isInstance (((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue())) {
- ApplicationClient appClient = (ApplicationClient)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- resRefs = appClient.getResourceRef();
- resEnvRefs = appClient.getResourceEnvRef();
- ejbRefs = appClient.getEjbRef();
- gbeanRefs = appClient.getGbeanRef();
- serviceRefs = appClient.getServiceRef();
- messageDestinations = appClient.getMessageDestination();
- }
- else if (OpenejbJar.class.isInstance (((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue())) {
- OpenejbJar ejbJar = (OpenejbJar)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- messageDestinations = ejbJar.getMessageDestination();
- }
}
/*
@@ -88,23 +50,26 @@
*/
protected void fillBody(IManagedForm managedForm) {
if (WebApp.class.isInstance (getDeploymentPlan().getValue())) {
- managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbRefs));
- managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resRefs));
- managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), serviceRefs));
- managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resEnvRefs));
- managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbLocalRefs));
- managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), messageDestinations));
+ WebApp webapp = (WebApp)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
+ managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getEjbRef()));
+ managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getResourceRef()));
+ managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getServiceRef()));
+ managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getResourceEnvRef()));
+ managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getEjbLocalRef()));
+ managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getMessageDestination()));
}
else if (ApplicationClient.class.isInstance (getDeploymentPlan().getValue())){
- managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbRefs));
- managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resRefs));
- managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), serviceRefs));
- managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resEnvRefs));
- managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), gbeanRefs));
- managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), messageDestinations));
+ ApplicationClient appClient = (ApplicationClient)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
+ managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getEjbRef()));
+ managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getResourceRef()));
+ managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getServiceRef()));
+ managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getResourceEnvRef()));
+ managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getGbeanRef()));
+ managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getMessageDestination()));
}
else if (OpenejbJar.class.isInstance (getDeploymentPlan().getValue())){
- managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), messageDestinations));
+ OpenejbJar ejbJar = (OpenejbJar)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
+ managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbJar.getMessageDestination()));
}
}
@@ -113,7 +78,7 @@
layout.numColumns = 1;
layout.horizontalSpacing = 20;
return layout;
- }
+ }
/*
* (non-Javadoc)
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java?rev=702576&r1=702575&r2=702576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java Tue Oct 7 11:30:46 2008
@@ -29,31 +29,31 @@
*/
public class WebGeneralPage extends AbstractGeronimoFormPage {
- public WebGeneralPage(FormEditor editor, String id, String title) {
- super(editor, id, title);
- }
+ public WebGeneralPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
- */
- protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
- managedForm.addPart(new WebContainerSection(body, toolkit, getStyle(), getDeploymentPlan()));
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+ */
+ protected void fillBody(IManagedForm managedForm) {
+ managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new WebContainerSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ }
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
- */
- public String getFormTitle() {
- return CommonMessages.webGeneralPageTitle;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
+ */
+ public String getFormTitle() {
+ return CommonMessages.webGeneralPageTitle;
+ }
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
+ @Override
+ protected void triggerGeronimoServerInfoUpdate() {
+ GeronimoServerInfo.getInstance().updateInfo();
+ }
}