You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/05/31 00:01:11 UTC
svn commit: r410389 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/
org.apache.geronimo.st.v11.core/META-INF/
org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/ ...
Author: sppatel
Date: Tue May 30 15:01:10 2006
New Revision: 410389
URL: http://svn.apache.org/viewvc?rev=410389&view=rev
Log:
add operations to persist test env options
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java (with props)
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.properties
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java Tue May 30 15:01:10 2006
@@ -28,13 +28,13 @@
public class GeronimoServer extends GenericGeronimoServer {
private static IGeronimoVersionHandler versionHandler = null;
-
+
private static DeploymentFactory deploymentFactory;
-
+
static {
deploymentFactory = new DeploymentFactoryImpl();
}
-
+
/*
* (non-Javadoc)
*
@@ -47,33 +47,6 @@
/*
* (non-Javadoc)
*
- * @see org.apache.geronimo.st.core.GenericGeronimoServer#getAdminID()
- */
- public String getAdminID() {
- return (String) getServerInstanceProperties().get(PROPERTY_ADMIN_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.st.core.GenericGeronimoServer#getAdminPassword()
- */
- public String getAdminPassword() {
- return (String) getServerInstanceProperties().get(PROPERTY_ADMIN_PW);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.st.core.GenericGeronimoServer#getRMINamingPort()
- */
- public String getRMINamingPort() {
- return (String) getServerInstanceProperties().get(PROPERTY_RMI_PORT);
- }
-
- /*
- * (non-Javadoc)
- *
* @see org.apache.geronimo.st.core.IGeronimoServer#getDeployerURL()
*/
public String getDeployerURL() {
@@ -109,8 +82,10 @@
public void configureDeploymentManager(DeploymentManager dm) {
((JMXDeploymentManager) dm).setLogConfiguration(true, true);
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.geronimo.st.core.IGeronimoServer#getDeploymentFactory()
*/
public DeploymentFactory getDeploymentFactory() {
@@ -127,8 +102,10 @@
versionHandler = new GeronimoV1VersionHandler();
return versionHandler;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.geronimo.st.core.IGeronimoServer#isTestEnvironment()
*/
public boolean isTestEnvironment() {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Tue May 30 15:01:10 2006
@@ -26,3 +26,6 @@
org.apache.ant,
org.apache.geronimo.runtime.common
Eclipse-AutoStart: true
+Export-Package: org.apache.geronimo.st.v11.core.operations,
+ org.apache.geronimo.st.v11.core.internal,
+ org.apache.geronimo.st.v11.core
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java Tue May 30 15:01:10 2006
@@ -27,6 +27,10 @@
import org.eclipse.wst.server.core.util.SocketUtil;
public class GeronimoServer extends GenericGeronimoServer {
+
+ public static final String PROPERTY_PERSISTENT = "persistent";
+ public static final String PROPERTY_IN_PLACE = "inPlace";
+ public static final String PROPERTY_RUN_FROM_WORKSPACE = "runFromWorkspace";
private static IGeronimoVersionHandler versionHandler = null;
@@ -36,9 +40,7 @@
deploymentFactory = new DeploymentFactoryImpl();
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.apache.geronimo.st.core.GenericGeronimoServer#getContextRoot(org.eclipse.wst.server.core.IModule)
*/
public String getContextRoot(IModule module) {
@@ -48,33 +50,6 @@
/*
* (non-Javadoc)
*
- * @see org.apache.geronimo.st.core.GenericGeronimoServer#getAdminID()
- */
- public String getAdminID() {
- return (String) getServerInstanceProperties().get(PROPERTY_ADMIN_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.st.core.GenericGeronimoServer#getAdminPassword()
- */
- public String getAdminPassword() {
- return (String) getServerInstanceProperties().get(PROPERTY_ADMIN_PW);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.st.core.GenericGeronimoServer#getRMINamingPort()
- */
- public String getRMINamingPort() {
- return (String) getServerInstanceProperties().get(PROPERTY_RMI_PORT);
- }
-
- /*
- * (non-Javadoc)
- *
* @see org.apache.geronimo.st.core.IGeronimoServer#getDeployerURL()
*/
public String getDeployerURL() {
@@ -140,6 +115,36 @@
*/
public boolean isTestEnvironment() {
return true;
+ }
+
+ public boolean isPersistant() {
+ return getAttribute(PROPERTY_PERSISTENT, false);
+ //return Boolean.getBoolean((String) getServerInstanceProperties().get(PROPERTY_PERSISTENT));
+ }
+
+ public boolean isInPlace() {
+ return getAttribute(PROPERTY_IN_PLACE, false);
+ //return Boolean.getBoolean((String) getServerInstanceProperties().get(PROPERTY_IN_PLACE));
+ }
+
+ public boolean isRunFromWorkspace() {
+ return getAttribute(PROPERTY_RUN_FROM_WORKSPACE, false);
+ //return Boolean.getBoolean((String) getServerInstanceProperties().get(PROPERTY_RUN_FROM_WORKSPACE));
+ }
+
+ public void setPersistent(boolean enable) {
+ setAttribute(PROPERTY_PERSISTENT, enable);
+ //getServerInstanceProperties().put(PROPERTY_PERSISTENT, Boolean.toString(enable));
+ }
+
+ public void setInPlace(boolean enable) {
+ setAttribute(PROPERTY_IN_PLACE, enable);
+ //getServerInstanceProperties().put(PROPERTY_IN_PLACE, Boolean.toString(enable));
+ }
+
+ public void setRunFromWorkspace(boolean enable) {
+ setAttribute(PROPERTY_RUN_FROM_WORKSPACE, enable);
+ //getServerInstanceProperties().put(PROPERTY_RUN_FROM_WORKSPACE, Boolean.toString(enable));
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF Tue May 30 15:01:10 2006
@@ -8,6 +8,15 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
+ org.apache.geronimo.st.v11.core,
+ org.eclipse.jst.server.generic.ui,
org.eclipse.wst.server.ui,
- org.eclipse.ui.forms
+ org.eclipse.jst.server.generic.core,
+ org.eclipse.wst.server.core,
+ org.eclipse.jst.server.core,
+ org.apache.geronimo.st.ui,
+ org.eclipse.ui.forms,
+ org.apache.geronimo.st.core,
+ org.eclipse.core.resources,
+ org.eclipse.wst.common.modulecore
Eclipse-AutoStart: true
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml Tue May 30 15:01:10 2006
@@ -2,9 +2,9 @@
<?eclipse version="3.0"?>
<plugin>
<extension point="org.eclipse.wst.server.ui.editorPageSections">
- <section id="org.apache.server.geronimo.security" order="10"
+ <section id="org.apache.server.geronimo.testenv" order="20"
insertionId="org.eclipse.wst.server.editor.overview.left"
- typeIds="org.apache.geronimo.generic.server.*"
+ typeIds="org.apache.geronimo.generic.server.11"
class="org.apache.geronimo.st.v11.ui.sections.ServerEditorTestEnvSection">
</section>
</extension>
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java?rev=410389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java Tue May 30 15:01:10 2006
@@ -0,0 +1,58 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v11.ui.commands;
+
+import org.apache.geronimo.st.ui.commands.ServerCommand;
+import org.apache.geronimo.st.v11.core.GeronimoServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+
+public class SetInPlaceDeploymentCommand extends ServerCommand {
+
+ boolean value;
+
+ boolean oldValue;
+
+ /**
+ * @param server
+ * @param name
+ */
+ public SetInPlaceDeploymentCommand(IServerWorkingCopy server, boolean value) {
+ super(server, "SetInPlaceDeploymentCommand");
+ this.value = value;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.ui.commands.ServerCommand#execute()
+ */
+ public void execute() {
+ GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+ oldValue = gs.isInPlace();
+ gs.setInPlace(value);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.ui.commands.ServerCommand#undo()
+ */
+ public void undo() {
+ GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+ gs.setInPlace(oldValue);
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetInPlaceDeploymentCommand.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java?rev=410389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java Tue May 30 15:01:10 2006
@@ -0,0 +1,57 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v11.ui.commands;
+
+import org.apache.geronimo.st.ui.commands.ServerCommand;
+import org.apache.geronimo.st.v11.core.GeronimoServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+
+public class SetPersistentCommand extends ServerCommand {
+
+ boolean value;
+
+ boolean oldValue;
+
+ /**
+ * @param server
+ * @param name
+ */
+ public SetPersistentCommand(IServerWorkingCopy server, boolean value) {
+ super(server, "SetPersistentCommand");
+ this.value = value;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.ui.commands.ServerCommand#execute()
+ */
+ public void execute() {
+ GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+ oldValue = gs.isPersistant();
+ gs.setPersistent(value);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.ui.commands.ServerCommand#undo()
+ */
+ public void undo() {
+ GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+ gs.setPersistent(oldValue);
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetPersistentCommand.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java?rev=410389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java Tue May 30 15:01:10 2006
@@ -0,0 +1,58 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v11.ui.commands;
+
+import org.apache.geronimo.st.ui.commands.ServerCommand;
+import org.apache.geronimo.st.v11.core.GeronimoServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+
+public class SetRunFromWorkspaceCommand extends ServerCommand {
+
+ boolean value;
+
+ boolean oldValue;
+
+ /**
+ * @param server
+ * @param name
+ */
+ public SetRunFromWorkspaceCommand(IServerWorkingCopy server, boolean value) {
+ super(server, "SetRunFromWorkspaceCommand");
+ this.value = value;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.ui.commands.ServerCommand#execute()
+ */
+ public void execute() {
+ GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+ oldValue = gs.isRunFromWorkspace();
+ gs.setRunFromWorkspace(value);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.ui.commands.ServerCommand#undo()
+ */
+ public void undo() {
+ GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+ gs.setRunFromWorkspace(oldValue);
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/commands/SetRunFromWorkspaceCommand.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.java?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.java Tue May 30 15:01:10 2006
@@ -11,8 +11,8 @@
public static String editorSectionTestEnvTitle;
public static String editorSectionTestEnvDescription;
- public static String editorSectionRunFromProject;
+ public static String editorSectionRunFromWorkspace;
public static String editorSectionEnableInPlace;
- public static String editorSectionSetPersistant;
+ public static String editorSectionSetPersistent;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.properties?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Messages.properties Tue May 30 15:01:10 2006
@@ -1,5 +1,5 @@
editorSectionTestEnvTitle=Test Environment
editorSectionTestEnvDescription=Configure local test environment options.
-editorSectionSetPersistant=Enable application persistance
+editorSectionSetPersistent=Enable application persistance
editorSectionEnableInPlace=Enable in-place deployment
-editorSectionRunFromProject=Run resources directly from project. (Stand-alone modules only)
\ No newline at end of file
+editorSectionRunFromWorkspace=Run stand-alone modules directly from workspace.
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java?rev=410389&r1=410388&r2=410389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java Tue May 30 15:01:10 2006
@@ -15,6 +15,10 @@
*/
package org.apache.geronimo.st.v11.ui.sections;
+import org.apache.geronimo.st.v11.core.GeronimoServer;
+import org.apache.geronimo.st.v11.ui.commands.SetInPlaceDeploymentCommand;
+import org.apache.geronimo.st.v11.ui.commands.SetPersistentCommand;
+import org.apache.geronimo.st.v11.ui.commands.SetRunFromWorkspaceCommand;
import org.apache.geronimo.st.v11.ui.internal.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
@@ -30,7 +34,7 @@
public class ServerEditorTestEnvSection extends ServerEditorSection {
- private Button runFromProject;
+ private Button runFromWorkspace;
private Button inPlace;
@@ -66,21 +70,24 @@
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
section.setClient(composite);
- persistant = toolkit.createButton(composite, Messages.editorSectionSetPersistant, SWT.CHECK);
+ persistant = toolkit.createButton(composite, Messages.editorSectionSetPersistent, SWT.CHECK);
inPlace = toolkit.createButton(composite, Messages.editorSectionEnableInPlace, SWT.CHECK);
- runFromProject = toolkit.createButton(composite, Messages.editorSectionRunFromProject, SWT.CHECK);
-
+ runFromWorkspace = toolkit.createButton(composite, Messages.editorSectionRunFromWorkspace, SWT.CHECK);
+
+ GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+ persistant.setSelection(gs.isPersistant());
+ inPlace.setSelection(gs.isInPlace());
+ runFromWorkspace.setSelection(gs.isRunFromWorkspace());
+
GridData data = new GridData();
data.horizontalIndent = 20;
- runFromProject.setLayoutData(data);
- runFromProject.setEnabled(inPlace.getSelection());
+ runFromWorkspace.setLayoutData(data);
+ runFromWorkspace.setEnabled(inPlace.getSelection());
persistant.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- if (persistant.getSelection()) {
- // TODO implementMe
- }
+ execute(new SetPersistentCommand(server, persistant.getSelection()));
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -91,8 +98,12 @@
inPlace.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- runFromProject.setEnabled(inPlace.getSelection());
- // TODO implementMe
+ execute(new SetInPlaceDeploymentCommand(server, inPlace.getSelection()));
+ runFromWorkspace.setEnabled(inPlace.getSelection());
+ if (!inPlace.getSelection()) {
+ runFromWorkspace.setSelection(false);
+ execute(new SetRunFromWorkspaceCommand(server, runFromWorkspace.getSelection()));
+ }
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -100,12 +111,10 @@
});
- runFromProject.addSelectionListener(new SelectionListener() {
+ runFromWorkspace.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- if (runFromProject.getSelection()) {
- // TODO implementMe
- }
+ execute(new SetRunFromWorkspaceCommand(server, runFromWorkspace.getSelection()));
}
public void widgetDefaultSelected(SelectionEvent e) {