You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/03/28 04:59:56 UTC
svn commit: r642083 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/
org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/
org.apache.geronimo.st.core/src/main/java/org/apache...
Author: mcconne
Date: Thu Mar 27 20:59:54 2008
New Revision: 642083
URL: http://svn.apache.org/viewvc?rev=642083&view=rev
Log:
GERONIMODEVTOOLS-318 Add support for generating geronimo-application-client.xml file(s) via the App Client Project Wizard
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/main/java/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/MANIFEST.MF?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/MANIFEST.MF Thu Mar 27 20:59:54 2008
@@ -9,11 +9,14 @@
Require-Bundle: org.eclipse.core.runtime,
org.apache.geronimo.runtime.common
Export-Package: com.sun.java.xml.ns.persistence,
+ org,
org.apache.geronimo.jee.application,
+ org.apache.geronimo.jee.applicationclient,
org.apache.geronimo.jee.connector,
org.apache.geronimo.jee.deployment,
org.apache.geronimo.jee.naming,
org.apache.geronimo.jee.openejb,
+ org.apache.geronimo.jee.persistence,
org.apache.geronimo.jee.security,
org.apache.geronimo.jee.web;uses:="org.apache.geronimo.xml.ns.deployment_1,org.apache.geronimo.xml.ns.naming_1,javax.xml.bind",
org.apache.geronimo.xml.ns.attributes_1;uses:="javax.xml.bind",
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Thu Mar 27 20:59:54 2008
@@ -691,6 +691,8 @@
modulePath = modulePath.addFileExtension("rar");
} else if (GeronimoUtils.isEarModule(workingModule)) {
modulePath = modulePath.addFileExtension("ear");
+ } else if (GeronimoUtils.isAppClientModule(workingModule)) {
+ modulePath = modulePath.addFileExtension("jar");
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java Thu Mar 27 20:59:54 2008
@@ -16,9 +16,6 @@
*/
package org.apache.geronimo.st.core;
-import java.io.IOException;
-import java.net.MalformedURLException;
-
import javax.enterprise.deploy.shared.ModuleType;
import org.apache.geronimo.st.core.internal.Trace;
@@ -46,6 +43,8 @@
public static final String APP_PLAN_NAME = "geronimo-application.xml";
+ public static final String APP_CLIENT_PLAN_NAME = "geronimo-application-client.xml";
+
public static final String CONNECTOR_PLAN_NAME = "geronimo-ra.xml";
public static final String SERVICE_PLAN_NAME = "geronimo-service.xml";
@@ -62,6 +61,10 @@
return "jst.ear".equals(module.getModuleType().getId());
}
+ public static boolean isAppClientModule(IModule module) {
+ return "jst.appclient".equals(module.getModuleType().getId());
+ }
+
public static boolean isRARModule(IModule module) {
return "jst.connnector".equals(module.getModuleType().getId());
}
@@ -95,6 +98,8 @@
return getOpenEjbDeploymentPlanFile(comp);
} else if (IModuleConstants.JST_EAR_MODULE.equals(type)) {
return getApplicationDeploymentPlanFile(comp);
+ } else if (IModuleConstants.JST_APPCLIENT_MODULE.equals(type)) {
+ return getApplicationClientDeploymentPlanFile(comp);
} else if (IModuleConstants.JST_CONNECTOR_MODULE.equals(type)) {
return getConnectorDeploymentPlanFile(comp);
} else if (IModuleConstants.JST_UTILITY_MODULE.equals(type)) {
@@ -119,6 +124,11 @@
public static IFile getApplicationDeploymentPlanFile(IVirtualComponent comp) {
IPath deployPlanPath = comp.getRootFolder().getUnderlyingFolder().getProjectRelativePath().append("META-INF").append(APP_PLAN_NAME);
+ return comp.getProject().getFile(deployPlanPath);
+ }
+
+ public static IFile getApplicationClientDeploymentPlanFile(IVirtualComponent comp) {
+ IPath deployPlanPath = comp.getRootFolder().getUnderlyingFolder().getProjectRelativePath().append("META-INF").append(APP_CLIENT_PLAN_NAME);
return comp.getProject().getFile(deployPlanPath);
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java Thu Mar 27 20:59:54 2008
@@ -46,6 +46,7 @@
"org.apache.geronimo.jee.openejb:" +
"org.apache.geronimo.jee.web:" +
"org.apache.geronimo.jee.application:" +
+ "org.apache.geronimo.jee.applicationclient:" +
"org.apache.geronimo.jee.deployment:" +
"org.apache.geronimo.jee.naming:" +
"org.apache.geronimo.jee.security", Activator.class.getClassLoader() );
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java Thu Mar 27 20:59:54 2008
@@ -69,6 +69,8 @@
createOpenEjbDeploymentPlan(GeronimoUtils.getOpenEjbDeploymentPlanFile(comp));
} else if (IModuleConstants.JST_EAR_MODULE.equals(type)) {
createGeronimoApplicationDeploymentPlan(GeronimoUtils.getApplicationDeploymentPlanFile(comp));
+ } else if (IModuleConstants.JST_APPCLIENT_MODULE.equals(type)) {
+ createGeronimoApplicationClientDeploymentPlan(GeronimoUtils.getApplicationClientDeploymentPlanFile(comp));
} else if (IModuleConstants.JST_CONNECTOR_MODULE.equals(type)) {
createConnectorDeploymentPlan(GeronimoUtils.getConnectorDeploymentPlanFile(comp));
} else if (IModuleConstants.JST_UTILITY_MODULE.equals(type)) {
@@ -89,6 +91,10 @@
return null;
}
+ public JAXBElement createGeronimoApplicationClientDeploymentPlan(IFile file) {
+ return null;
+ }
+
public JAXBElement createConnectorDeploymentPlan(IFile file) {
return null;
}
@@ -96,4 +102,5 @@
public JAXBElement createServiceDeploymentPlan(IFile file) {
return null;
}
+
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml Thu Mar 27 20:59:54 2008
@@ -150,15 +150,26 @@
</section>
</extension>
+
+ <!--
+ |
+ | Define the Web editor class for the various Geronimo-specific XML files
+ | (except for geronimo-application-client.xml)
+ |
+ -->
<extension point="org.eclipse.ui.editors">
<editor class="org.apache.geronimo.st.ui.editors.SharedDeploymentPlanEditor"
default="true"
- filenames="geronimo-web.xml,geronimo-application.xml,openejb-jar.xml,geronimo-ra.xml"
+ filenames="geronimo-web.xml,
+ geronimo-application.xml,
+ openejb-jar.xml,
+ geronimo-ra.xml"
icon="icons/obj16/littleG.gif"
id="org.apache.geronimo.ui.editors.WebEditor"
name="%deploymentPlanEditorName">
</editor>
</extension>
+
<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
<launchConfigurationTypeImage
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java Thu Mar 27 20:59:54 2008
@@ -49,6 +49,8 @@
addConnectorPlanPages(editor);
} else if(GeronimoUtils.APP_PLAN_NAME.equals(planFileName)) {
addApplicationPlanPages(editor);
+ } else if(GeronimoUtils.APP_CLIENT_PLAN_NAME.equals(planFileName)) {
+ addApplicationClientPlanPages(editor);
}
}
}
@@ -60,6 +62,8 @@
abstract public void addConnectorPlanPages(FormEditor editor) throws PartInitException;
abstract public void addApplicationPlanPages(FormEditor editor) throws PartInitException;
+
+ abstract public void addApplicationClientPlanPages(FormEditor editor) throws PartInitException;
public void saveDeploymentPlan(JAXBElement deploymentPlan, IFile file) throws IOException, JAXBException {
JAXBUtils.marshalDeploymentPlan(deploymentPlan, file);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java Thu Mar 27 20:59:54 2008
@@ -52,6 +52,14 @@
/*
* (non-Javadoc)
*
+ * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addApplicationPlanPages(org.eclipse.ui.forms.editor.FormEditor)
+ */
+ public void addApplicationClientPlanPages(FormEditor editor) throws PartInitException {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addConnectorPlanPages(org.eclipse.ui.forms.editor.FormEditor)
*/
public void addConnectorPlanPages(FormEditor editor) throws PartInitException {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/main/java/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/main/java/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/main/java/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/main/java/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java Thu Mar 27 20:59:54 2008
@@ -49,6 +49,14 @@
/*
* (non-Javadoc)
*
+ * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addApplicationPlanPages(org.eclipse.ui.forms.editor.FormEditor)
+ */
+ public void addApplicationClientPlanPages(FormEditor editor) throws PartInitException {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addConnectorPlanPages(org.eclipse.ui.forms.editor.FormEditor)
*/
public void addConnectorPlanPages(FormEditor editor) throws PartInitException {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java Thu Mar 27 20:59:54 2008
@@ -19,6 +19,7 @@
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.application.Application;
+import org.apache.geronimo.jee.applicationclient.ApplicationClient;
import org.apache.geronimo.jee.connector.Connector;
import org.apache.geronimo.jee.deployment.Artifact;
import org.apache.geronimo.jee.deployment.Environment;
@@ -204,6 +205,17 @@
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getApplicationDeploymentPlan", null);
+ return null;
+ }
+
+ public static JAXBElement getApplicationClientDeploymentPlan(IFile file) {
+ Trace.tracePoint("ENTRY", "GeronimoV21Utils.getApplicationClientDeploymentPlan", file);
+
+ if (file.getName().equals(APP_CLIENT_PLAN_NAME) && file.exists()) {
+ return JAXBUtils.unmarshalDeploymentPlan(file);
+ }
+
+ Trace.tracePoint("EXIT", "GeronimoV21Utils.getApplicationClientDeploymentPlan", null);
return null;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java Thu Mar 27 20:59:54 2008
@@ -19,6 +19,7 @@
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.application.Application;
+import org.apache.geronimo.jee.applicationclient.ApplicationClient;
import org.apache.geronimo.jee.connector.Connector;
import org.apache.geronimo.jee.deployment.Artifact;
import org.apache.geronimo.jee.deployment.Dependencies;
@@ -43,20 +44,13 @@
*
* <ol>
* <li>geronimo-application.xml
+ * <li>geronimo-application-client.xml
* <li>geronimo-ra.xml
* <li>geronimo-service.xml
* <li>geronimo-web.xml
* <li>openejb-jar.xml
* </ol>
*
- * Remaining TODO Task(s):
- *
- * <ol>
- * <li>JUnit testcases
- * <li>JAXBElement warning messages
- * <li>How to invoke Service Deployment Plan
- * </ol>
- *
* @version $Rev: 509704 $ $Date: 2007-02-20 13:42:24 -0500 (Tue, 20 Feb 2007) $
*/
public class V21DeploymentPlanCreationOperation extends DeploymentPlanCreationOperation {
@@ -92,6 +86,8 @@
}
+
+
/*
* (non-Javadoc)
*
@@ -173,6 +169,25 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
+ */
+ public JAXBElement createGeronimoApplicationClientDeploymentPlan(IFile dpFile) {
+ Trace.tracePoint("Entry","V21DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", dpFile);
+
+ org.apache.geronimo.jee.applicationclient.ObjectFactory applicationClientFactory = new org.apache.geronimo.jee.applicationclient.ObjectFactory();
+ ApplicationClient applicationClient = applicationClientFactory.createApplicationClient();
+
+ applicationClient.setServerEnvironment(getConfigEnvironment());
+
+ JAXBElement jaxbElement = applicationClientFactory.createApplicationClient(applicationClient);
+ JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
+
+ Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", applicationClientFactory.createApplicationClient(applicationClient));
+ return applicationClientFactory.createApplicationClient(applicationClient);
+ }
public Environment getConfigEnvironment() {
Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.getConfigEnvironment");
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java Thu Mar 27 20:59:54 2008
@@ -66,6 +66,18 @@
/*
* (non-Javadoc)
*
+ * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addApplicationPlanPages(org.eclipse.ui.forms.editor.FormEditor)
+ */
+ public void addApplicationClientPlanPages(FormEditor editor) throws PartInitException {
+ editor.addPage(new AppGeneralPage(editor, "appgeneralpage", CommonMessages.editorTabGeneral));
+ editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, null));
+ editor.addPage(getApplicationDeploymentPage(editor));
+ }
+
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addOpenEjbPlanPages()
*/
public void addOpenEjbPlanPages(FormEditor editor) throws PartInitException {
@@ -139,6 +151,13 @@
DeploymentPage formPage = createDeploymentFormPage(editor);
// formPage.environment = ConnectorFactory.eINSTANCE.getConnectorPackage().getConnectorType_Environment();
// formPage.gbeanERef = ConnectorFactory.eINSTANCE.getConnectorPackage().getConnectorType_Gbean();
+ return formPage;
+ }
+
+ protected FormPage getApplicationClientDeploymentPage(FormEditor editor) {
+ DeploymentPage formPage = createDeploymentFormPage(editor);
+// formPage.environment = ApplicationFactory.eINSTANCE.getApplicationPackage().getApplicationType_Environment();
+// formPage.gbeanERef = ApplicationFactory.eINSTANCE.getApplicationPackage().getApplicationType_Gbean();
return formPage;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java?rev=642083&r1=642082&r2=642083&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java Thu Mar 27 20:59:54 2008
@@ -20,17 +20,16 @@
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.jee.security.Description;
+import org.apache.geronimo.jee.security.Role;
+import org.apache.geronimo.jee.security.RoleMappings;
+import org.apache.geronimo.jee.security.Security;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.providers.AdapterFactory;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v21.ui.Activator;
import org.apache.geronimo.st.v21.ui.wizards.SecurityRoleWizard;
-import org.apache.geronimo.jee.naming.ResourceRef;
-import org.apache.geronimo.jee.security.Description;
-import org.apache.geronimo.jee.security.RoleMappings;
-import org.apache.geronimo.jee.security.Role;
-import org.apache.geronimo.jee.security.Security;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.SWT;