You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/06/18 10:10:16 UTC
svn commit: r955877 [3/6] - in
/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins:
org.apache.geronimo.runtime.common/
org.apache.geronimo.runtime.common/META-INF/
org.apache.geronimo.runtime.v20/ org.apache.geronimo.runtime.v20/META-INF/
org.apa...
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF Fri Jun 18 08:10:13 2010
@@ -6,11 +6,11 @@ Bundle-Version: 2.2.1
Bundle-Activator: org.apache.geronimo.st.v21.ui.Activator
Bundle-Localization: plugin
Require-Bundle: org.apache.geronimo.runtime.common,
+ org.apache.geronimo.runtime.v21,
org.apache.geronimo.jee.v21.jaxbmodel,
org.apache.geronimo.st.v21.core,
org.apache.geronimo.st.core,
- org.apache.geronimo.st.ui,
- org.apache.geronimo.runtime.v22,
+ org.apache.geronimo.st.ui;visibility:=reexport,
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.commands,
@@ -19,7 +19,7 @@ Require-Bundle: org.apache.geronimo.runt
org.eclipse.core.resources,
org.eclipse.wst.common.project.facet.ui,
org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
+ org.eclipse.wst.server.ui;visibility:=reexport,
org.eclipse.ui.ide,
org.eclipse.wst.common.modulecore,
org.eclipse.wst.sse.ui,
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml Fri Jun 18 08:10:13 2010
@@ -39,7 +39,7 @@
<extension point="org.eclipse.wst.server.ui.editorPages">
<page id="org.eclipse.wst.server.editor.plugins" order="10"
name="%serverEditorPluginPage"
- typeIds="org.apache.geronimo.server.*"
+ typeIds="org.apache.geronimo.server.21"
insertionIds="org.eclipse.wst.server.editor.plugins"
class="org.apache.geronimo.st.v21.ui.pages.ServerPluginPage"/>
</extension>
@@ -47,7 +47,7 @@
<extension point="org.eclipse.wst.server.ui.editorPageSections">
<section id="org.apache.server.geronimo.plugins" order="10"
insertionId="org.eclipse.wst.server.editor.plugins"
- typeIds="org.apache.geronimo.server.*"
+ typeIds="org.apache.geronimo.server.21"
class="org.apache.geronimo.st.v21.ui.sections.ServerPluginSection">
</section>
</extension>
@@ -67,24 +67,6 @@
org.apache.geronimo.server.22"
class="org.apache.geronimo.st.v21.ui.internal.GeronimoServerWizardFragment"/>
</extension>
-
- <extension point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- id="org.apache.geronimo.v21.ui.serveractions"
- objectClass="org.eclipse.wst.server.core.IServer">
- <enablement>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.server.ui.serverType"
- value="org.apache.geronimo.server.2*" />
- </enablement>
- <action id="org.apache.geronimo.v21.ui.launchSupport"
- label="%PopupMenus.launchSupport" icon="icons/obj16/littleG.gif"
- class="org.apache.geronimo.st.v21.ui.actions.LaunchGeronimoSupportAction"
- enablesFor="1">
- </action>
- </objectContribution>
- </extension>
<extension point="org.eclipse.ui.popupMenus">
<objectContribution
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/pom.xml Fri Jun 18 08:10:13 2010
@@ -131,7 +131,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.runtime.v22</artifactId>
+ <artifactId>org.apache.geronimo.runtime.v21</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/AbstractGeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/AbstractGeronimoFormContentLoader.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/AbstractGeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/AbstractGeronimoFormContentLoader.java Fri Jun 18 08:10:13 2010
@@ -22,6 +22,7 @@ import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader;
+import org.apache.geronimo.st.ui.editors.SharedDeploymentPlanEditor;
import org.apache.geronimo.st.v21.core.GeronimoUtils;
import org.apache.geronimo.st.core.jaxb.JAXBUtils;
import org.eclipse.core.resources.IFile;
@@ -39,7 +40,7 @@ public abstract class AbstractGeronimoFo
* @see org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader#doAddPages(org.eclipse.ui.forms.editor.FormEditor)
*/
public void doAddPages(FormEditor editor) throws PartInitException{
- triggerGeronimoServerInfoUpdate();
+ triggerGeronimoServerInfoUpdate(((SharedDeploymentPlanEditor)editor).getRuntimeVersion());
IEditorInput input = editor.getEditorInput();
if(input instanceof IFileEditorInput) {
String planFileName = ((IFileEditorInput) input).getFile().getName();
@@ -57,7 +58,7 @@ public abstract class AbstractGeronimoFo
}
}
- abstract public void triggerGeronimoServerInfoUpdate() throws PartInitException;
+ abstract public void triggerGeronimoServerInfoUpdate(String runtimeVersion) throws PartInitException;
abstract public void addWebPlanPages(FormEditor editor) throws PartInitException;
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/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/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java Fri Jun 18 08:10:13 2010
@@ -16,16 +16,12 @@
*/
package org.apache.geronimo.st.v21.ui.editors;
-import java.io.IOException;
-
import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
import org.apache.geronimo.st.core.jaxb.JAXBUtils;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
-import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoFormContentLoader;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.core.GeronimoV21Utils;
import org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanDataModelProvider;
import org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanOperation;
@@ -54,6 +50,7 @@ import org.eclipse.wst.sse.ui.Structured
* @version $Rev$ $Date$
*/
public class GeronimoFormContentLoader extends AbstractGeronimoFormContentLoader {
+
/*
* (non-Javadoc)
@@ -136,8 +133,8 @@ public class GeronimoFormContentLoader e
return new DeploymentPage(editor, "deploymentpage", CommonMessages.editorTabDeployment);
}
- public void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ public void triggerGeronimoServerInfoUpdate(String runtimeVersion) {
+ GeronimoServerInfoManager.getProvider(runtimeVersion).updateInfo();
}
public StructuredTextEditor getDeploymentPlanSourcePage(AbstractGeronimoDeploymentPlanEditor editor) {
@@ -162,4 +159,5 @@ public class GeronimoFormContentLoader e
}
+
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java Fri Jun 18 08:10:13 2010
@@ -21,6 +21,7 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.st.core.DeploymentDescriptorUtils;
import org.apache.geronimo.st.core.descriptor.AbstractDeploymentDescriptor;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.SharedDeploymentPlanEditor;
import org.apache.geronimo.st.v21.ui.Activator;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.Action;
@@ -48,6 +49,8 @@ public abstract class AbstractGeronimoFo
JAXBElement deploymentPlan;
AbstractDeploymentDescriptor deploymentDescriptor;
+
+ String runtimeVersion ;
protected FormToolkit toolkit;
@@ -60,6 +63,7 @@ public abstract class AbstractGeronimoFo
*/
public AbstractGeronimoFormPage(FormEditor editor, String id, String title) {
super(editor, id, title);
+ runtimeVersion = ((SharedDeploymentPlanEditor)editor).getRuntimeVersion();
}
/**
@@ -175,4 +179,8 @@ public abstract class AbstractGeronimoFo
public String getFormTitle() {
return getTitle();
}
+
+ protected String getRuntimeVersion(){
+ return runtimeVersion;
+ }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientGeneralPage.java Fri Jun 18 08:10:13 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v21.ui.pa
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.AppClientClientGeneralSection;
import org.apache.geronimo.st.v21.ui.sections.AppClientServerGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
@@ -54,7 +54,7 @@ public class AppClientGeneralPage extend
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java Fri Jun 18 08:10:13 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v21.ui.pa
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.AppClientSecuritySection;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.ui.forms.IManagedForm;
@@ -64,7 +64,7 @@ public class AppClientSecurityPage exten
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java Fri Jun 18 08:10:13 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v21.ui.pa
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.AppGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -52,7 +52,7 @@ public class AppGeneralPage extends Abst
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java Fri Jun 18 08:10:13 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v21.ui.pa
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.ConnectorGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -52,7 +52,7 @@ public class ConnectorOverviewPage exten
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java Fri Jun 18 08:10:13 2010
@@ -21,7 +21,7 @@ import org.apache.geronimo.st.ui.CommonM
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.DBPoolSection;
import org.eclipse.swt.layout.GridLayout;
@@ -59,7 +59,7 @@ public class ConnectorPage extends Abstr
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java Fri Jun 18 08:10:13 2010
@@ -22,7 +22,7 @@ import org.apache.geronimo.jee.connector
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v21.ui.sections.AdminObjectSection;
import org.apache.geronimo.st.v21.ui.sections.ClassFilterSection;
@@ -49,7 +49,7 @@ public class DeploymentPage extends Abst
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle()));
+ managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(),getRuntimeVersion()));
managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle()));
managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, true));
managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, false));
@@ -64,7 +64,7 @@ public class DeploymentPage extends Abst
managedForm.addPart(new AdminObjectSection(getDeploymentPlan(), body, toolkit, getStyle(), connector.getAdminobject()));
}
if (ApplicationClient.class.isInstance(getDeploymentPlan().getValue())) {
- managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false));
+ managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false,getRuntimeVersion()));
managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, true));
managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, false));
}
@@ -88,7 +88,7 @@ public class DeploymentPage extends Abst
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java Fri Jun 18 08:10:13 2010
@@ -17,7 +17,7 @@
package org.apache.geronimo.st.v21.ui.pages;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarCMPSection;
import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
@@ -44,6 +44,6 @@ public class EjbOverviewPage extends Abs
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java Fri Jun 18 08:10:13 2010
@@ -22,7 +22,7 @@ import org.apache.geronimo.jee.web.WebAp
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.EjbLocalRefSection;
import org.apache.geronimo.st.v21.ui.sections.EjbRefSection;
import org.apache.geronimo.st.v21.ui.sections.EjbRelationSection;
@@ -98,6 +98,6 @@ public class NamingFormPage extends Abst
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java Fri Jun 18 08:10:13 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v21.ui.pa
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v21.ui.sections.SecurityAdvancedSection;
import org.apache.geronimo.st.v21.ui.sections.SecurityRealmSection;
@@ -42,9 +42,9 @@ public class SecurityPage extends Abstra
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new SecurityRealmSection(getDeploymentPlan(),JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle()));
- managedForm.addPart(new SecurityRoleMappingSection(getDeploymentPlan(), getDeploymentDescriptor(), body, toolkit, getStyle()));
- managedForm.addPart(new SecurityAdvancedSection(getDeploymentPlan(), body, toolkit, getStyle()));
+ managedForm.addPart(new SecurityRealmSection(getDeploymentPlan(),JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle(),getRuntimeVersion()));
+ managedForm.addPart(new SecurityRoleMappingSection(getDeploymentPlan(), getDeploymentDescriptor(), body, toolkit, getStyle(),getRuntimeVersion()));
+ managedForm.addPart(new SecurityAdvancedSection(getDeploymentPlan(), body, toolkit, getStyle(),getRuntimeVersion()));
}
/*
@@ -69,7 +69,7 @@ public class SecurityPage extends Abstra
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/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.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java Fri Jun 18 08:10:13 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v21.ui.pa
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.ui.sections.WebContainerSection;
import org.apache.geronimo.st.v21.ui.sections.WebGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
@@ -54,6 +54,6 @@ public class WebGeneralPage extends Abst
@Override
protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
+ GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java Fri Jun 18 08:10:13 2010
@@ -41,18 +41,21 @@ public class DependencySection extends A
boolean isServerEnvironment;
protected Environment environment;
+ private String runtimeVersionNumber;
- public DependencySection(JAXBElement plan, Environment environment, Composite parent, FormToolkit toolkit, int style) {
- this(plan, environment, parent, toolkit, style, true);
+ public DependencySection(JAXBElement plan, Environment environment, Composite parent, FormToolkit toolkit, int style,String runtimeVersion) {
+ this(plan, environment, parent, toolkit, style, true,runtimeVersion);
}
- public DependencySection(JAXBElement plan, Environment environment, Composite parent, FormToolkit toolkit, int style, boolean isServerEnvironment) {
+ public DependencySection(JAXBElement plan, Environment environment, Composite parent, FormToolkit toolkit, int style, boolean isServerEnvironment,String runtimeVersion) {
super(plan, parent, toolkit, style);
this.environment = environment;
this.isServerEnvironment = isServerEnvironment;
this.COLUMN_NAMES = new String[] {
CommonMessages.groupId, CommonMessages.artifactId, CommonMessages.version, CommonMessages.artifactType
};
+
+ runtimeVersionNumber = runtimeVersion;
createClient();
getSection().setExpanded(false);
}
@@ -139,4 +142,8 @@ public class DependencySection extends A
}
};
}
+
+ public String getRuntimeVersion(){
+ return runtimeVersionNumber;
+ }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityAdvancedSection.java Fri Jun 18 08:10:13 2010
@@ -32,7 +32,7 @@ import org.apache.geronimo.jee.security.
import org.apache.geronimo.jee.security.SubjectInfo;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v21.ui.wizards.SecurityRunAsSubjectWizard;
import org.eclipse.jface.viewers.IBaseLabelProvider;
@@ -70,11 +70,14 @@ public class SecurityAdvancedSection ext
protected Button doAsCurrentCaller;
protected Button useContextHandler;
+
+ protected String runtimeVersionNumber;
private HashMap<Pattern,HashMap<String,ArrayList<String>>> credentialStoreAttributes;
- public SecurityAdvancedSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style) {
+ public SecurityAdvancedSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style,String runtimeVersion) {
super(plan, parent, toolkit, style);
+ runtimeVersionNumber=runtimeVersion;
createClient();
}
@@ -394,7 +397,7 @@ public class SecurityAdvancedSection ext
credentialStoreRef.add(""); //users will select this empty string to unset credentialStoreRef
}
- List<Pattern> deployedCredentialStores = GeronimoServerInfo.getInstance().getDeployedCredentialStores();
+ List<Pattern> deployedCredentialStores = GeronimoServerInfoManager.getProvider(runtimeVersionNumber).getDeployedCredentialStores();
Pattern pattern = new Pattern();
pattern.setCustomFoo(credentialStoreRefName);
if (deployedCredentialStores.contains(pattern)) {
@@ -407,7 +410,7 @@ public class SecurityAdvancedSection ext
credentialStoreRef.add(credentialStoreName);
credentialStoreList.put(credentialStoreName, deployedCredentialStores.get(i));
}
- credentialStoreAttributes = GeronimoServerInfo.getInstance().getDeployedCredentialStoreAttributes();
+ credentialStoreAttributes = GeronimoServerInfoManager.getProvider(runtimeVersionNumber).getDeployedCredentialStoreAttributes();
credentialStoreRef.select(0);
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java Fri Jun 18 08:10:13 2010
@@ -41,155 +41,151 @@ import org.eclipse.ui.forms.editor.FormE
import org.eclipse.ui.forms.widgets.FormToolkit;
public class SecurityRealmSection extends AbstractTableSection {
- public SecurityRealmSection(JAXBElement plan, List gbeans,
- Composite parent, FormToolkit toolkit, int style) {
- super(plan, parent, toolkit, style);
- this.objectContainer = gbeans;
- COLUMN_NAMES = new String[] { "Security Realm Name",
- "Login Module Class" };// TODO put into message
- createClient();
+
+ private String runtimeVersionNumber = null;
+
+ public SecurityRealmSection(JAXBElement plan, List gbeans, Composite parent, FormToolkit toolkit, int style,String runtimeVersion) {
+ super(plan, parent, toolkit, style);
+ this.objectContainer = gbeans;
+ runtimeVersionNumber = runtimeVersion;
+ COLUMN_NAMES = new String[] { "Security Realm Name", "Login Module Class" };// TODO put into message
+ createClient();
}
@Override
public String getDescription() {
- return "The following security realms are defined:";// TODO put into
- // message
+ return "The following security realms are defined:";// TODO put into
+ // message
}
@Override
public Class getTableEntryObjectType() {
- return JAXBElement.class;
+ return JAXBElement.class;
}
@Override
public String getTitle() {
- return "Security Realm";// TODO put into message
+ return "Security Realm";// TODO put into message
}
@Override
protected Wizard getWizard() {
- return new SecurityRealmWizard(this);
+ return new SecurityRealmWizard(this);
}
protected void notifyOthers() {
- notifyGBeanSectionToRefresh();
+ notifyGBeanSectionToRefresh();
}
/*
- * After add, remove, edit realm gbean, notify the gbean section to refresh.
- * If the deploymentpage has not been initialized, catch a
- * NullPointerException and just ignore it.
+ * After add, remove, edit realm gbean, notify the gbean section to refresh. If the deploymentpage has not been
+ * initialized, catch a NullPointerException and just ignore it.
*/
private void notifyGBeanSectionToRefresh() {
- try {
- SecurityPage securityPage = (SecurityPage) this.getManagedForm()
- .getContainer();
- FormEditor editor = securityPage.getEditor();
- IFormPart[] parts = editor.findPage("deploymentpage")
- .getManagedForm().getParts();
- GBeanSection gbeanSection = null;
- for (IFormPart part : parts) {
- if (GBeanSection.class.isInstance(part)) {
- gbeanSection = (GBeanSection) part;
- }
- }
- gbeanSection.getViewer().refresh();
- } catch (NullPointerException e) {
- // Ignore, this exception happens when the deployment page hasn't
- // been initialized
- }
+ try {
+ SecurityPage securityPage = (SecurityPage) this.getManagedForm().getContainer();
+ FormEditor editor = securityPage.getEditor();
+ IFormPart[] parts = editor.findPage("deploymentpage").getManagedForm().getParts();
+ GBeanSection gbeanSection = null;
+ for (IFormPart part : parts) {
+ if (GBeanSection.class.isInstance(part)) {
+ gbeanSection = (GBeanSection) part;
+ }
+ }
+ gbeanSection.getViewer().refresh();
+ } catch (NullPointerException e) {
+ // Ignore, this exception happens when the deployment page hasn't
+ // been initialized
+ }
}
@Override
public ITreeContentProvider getContentProvider() {
- return new ContentProvider() {
- @Override
- public Object[] getElements(Object inputElement) {
- List<JAXBElement<?>> result = new ArrayList<JAXBElement<?>>();
- List<?> list = getObjectContainer();
- for (Iterator<?> it = list.iterator(); it.hasNext();) {
- JAXBElement<?> current = (JAXBElement<?>) it.next();
- if (isSecurityRealmGbean((Gbean) current.getValue())) {
- result.add(current);
- }
- }
- return result.toArray();
- }
- };
+ return new ContentProvider() {
+ @Override
+ public Object[] getElements(Object inputElement) {
+ List<JAXBElement<?>> result = new ArrayList<JAXBElement<?>>();
+ List<?> list = getObjectContainer();
+ for (Iterator<?> it = list.iterator(); it.hasNext();) {
+ JAXBElement<?> current = (JAXBElement<?>) it.next();
+ if (isSecurityRealmGbean((Gbean) current.getValue())) {
+ result.add(current);
+ }
+ }
+ return result.toArray();
+ }
+ };
}
private boolean isSecurityRealmGbean(Gbean gbean) {
- return "org.apache.geronimo.security.realm.GenericSecurityRealm"
- .equals(gbean.getClazz());
+ return "org.apache.geronimo.security.realm.GenericSecurityRealm".equals(gbean.getClazz());
}
@Override
public ITableLabelProvider getLabelProvider() {
- return new LabelProvider() {
- @Override
- public String getColumnText(Object element, int columnIndex) {
- // System.out.println("here");
- if (JAXBElement.class.isInstance(element)) {
- Object value = ((JAXBElement<?>) element).getValue();
- if (Gbean.class.isInstance(value)) {
- Gbean gbean = (Gbean) value;
- switch (columnIndex) {
- case 0:// security realm name
- if (getGbeanAttributeValue(gbean, "realmName") != null) {
- return getGbeanAttributeValue(gbean,
- "realmName");
- }
- return "";
- case 1:// login module class
- if (getSecurityRealmGbeanLoginModuleClass(gbean) != null) {
- return getSecurityRealmGbeanLoginModuleClass(gbean);
- }
- return "";
- }
- }
- }
- return null;
- }
- };
+ return new LabelProvider() {
+ @Override
+ public String getColumnText(Object element, int columnIndex) {
+ // System.out.println("here");
+ if (JAXBElement.class.isInstance(element)) {
+ Object value = ((JAXBElement<?>) element).getValue();
+ if (Gbean.class.isInstance(value)) {
+ Gbean gbean = (Gbean) value;
+ switch (columnIndex) {
+ case 0:// security realm name
+ if (getGbeanAttributeValue(gbean, "realmName") != null) {
+ return getGbeanAttributeValue(gbean, "realmName");
+ }
+ return "";
+ case 1:// login module class
+ if (getSecurityRealmGbeanLoginModuleClass(gbean) != null) {
+ return getSecurityRealmGbeanLoginModuleClass(gbean);
+ }
+ return "";
+ }
+ }
+ }
+ return null;
+ }
+ };
}
private String getGbeanAttributeValue(Gbean gbean, String attributeName) {
- try {
- List<JAXBElement<?>> elelist = gbean
- .getAttributeOrXmlAttributeOrReference();
- for (JAXBElement<?> ele : elelist) {
- if (Attribute.class.isInstance(ele.getValue())
- && ((Attribute) ele.getValue()).getName().equals(
- attributeName)) {
- return ((Attribute) ele.getValue()).getValue();
- }
- }
- } catch (NullPointerException e) {
- // ignore
- }
- return null;
+ try {
+ List<JAXBElement<?>> elelist = gbean.getAttributeOrXmlAttributeOrReference();
+ for (JAXBElement<?> ele : elelist) {
+ if (Attribute.class.isInstance(ele.getValue())
+ && ((Attribute) ele.getValue()).getName().equals(attributeName)) {
+ return ((Attribute) ele.getValue()).getValue();
+ }
+ }
+ } catch (NullPointerException e) {
+ // ignore
+ }
+ return null;
}
private String getSecurityRealmGbeanLoginModuleClass(Gbean gbean) {
- if (isSecurityRealmGbean(gbean)) {
- try {
- List<JAXBElement<?>> elelist = gbean
- .getAttributeOrXmlAttributeOrReference();
- for (JAXBElement<?> ele : elelist) {
- if (XmlAttributeType.class.isInstance(ele.getValue())
- && ((XmlAttributeType) ele.getValue()).getName()
- .equals("LoginModuleConfiguration")) {
- LoginModule loginModule = (LoginModule) ((LoginConfig) ((XmlAttributeType) ele
- .getValue()).getAny())
- .getLoginModuleRefOrLoginModule().get(0);
- return loginModule.getLoginModuleClass();
- }
- }
- return null;
- } catch (NullPointerException e) {
- // ignore
- }
- }
- return null;
+ if (isSecurityRealmGbean(gbean)) {
+ try {
+ List<JAXBElement<?>> elelist = gbean.getAttributeOrXmlAttributeOrReference();
+ for (JAXBElement<?> ele : elelist) {
+ if (XmlAttributeType.class.isInstance(ele.getValue())
+ && ((XmlAttributeType) ele.getValue()).getName().equals("LoginModuleConfiguration")) {
+ LoginModule loginModule = (LoginModule) ((LoginConfig) ((XmlAttributeType) ele.getValue())
+ .getAny()).getLoginModuleRefOrLoginModule().get(0);
+ return loginModule.getLoginModuleClass();
+ }
+ }
+ return null;
+ } catch (NullPointerException e) {
+ // ignore
+ }
+ }
+ return null;
+ }
+
+ public String getRuntimeVersion(){
+ return runtimeVersionNumber;
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java Fri Jun 18 08:10:13 2010
@@ -54,14 +54,19 @@ import org.eclipse.ui.forms.widgets.Form
*/
public class SecurityRoleMappingSection extends AbstractTreeSection {
+ private String runtimeVersionNumber;
+
public SecurityRoleMappingSection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style) {
super(plan, parent, toolkit, style);
createClient();
}
public SecurityRoleMappingSection(JAXBElement plan, AbstractDeploymentDescriptor descriptor, Composite parent,
- FormToolkit toolkit, int style) {
+ FormToolkit toolkit, int style,String runtimeVersion) {
super(plan, descriptor, parent, toolkit, style);
+
+ runtimeVersionNumber = runtimeVersion;
+
createClient();
}
@@ -291,4 +296,8 @@ public class SecurityRoleMappingSection
}
};
}
+
+ public String getRuntimeVersion(){
+ return runtimeVersionNumber;
+ }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java Fri Jun 18 08:10:13 2010
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.st.v21.ui.sections;
-import org.apache.geronimo.st.v21.ui.commands.SetVMArgsCommand;
import org.apache.geronimo.st.ui.internal.Messages;
+import org.apache.geronimo.st.v21.ui.commands.SetVMArgsCommand;
import org.eclipse.debug.internal.ui.SWTFactory;
import org.eclipse.debug.ui.StringVariableSelectionDialog;
import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java Fri Jun 18 08:10:13 2010
@@ -23,8 +23,10 @@ import org.apache.geronimo.st.core.jaxb.
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v21.ui.sections.DependencySection;
+import org.apache.geronimo.st.v21.ui.sections.SecurityRealmSection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -110,7 +112,8 @@ public class DependencyWizard extends Ab
}
public void populateTable() {
- List<Dependency> serverList = GeronimoServerInfo.getInstance().getCommonLibs();
+ String runtimeVersion = ((DependencySection)(DependencyWizard.this.section)).getRuntimeVersion();
+ List<Dependency> serverList = GeronimoServerInfoManager.getProvider(runtimeVersion).getCommonLibs();
List<Dependency> alreadyAddedDependencies = (List<Dependency>) section.getObjectContainer();
serverList.removeAll(alreadyAddedDependencies);
for (int i = 0; i < serverList.size(); ++i) {