geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r616592 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/ org.apache.geronimo.st.ui/src/org/apache/geronimo/s...
Date Wed, 30 Jan 2008 02:16:50 GMT
Author: mcconne
Date: Tue Jan 29 18:16:49 2008
New Revision: 616592

URL: http://svn.apache.org/viewvc?rev=616592&view=rev
Log:
GERONIMODEVTOOLS-264 Start integrating classpath containers support

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetSelectClasspathContainersCommand.java
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorTestEnvSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Trace.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
Tue Jan 29 18:16:49 2008
@@ -73,6 +73,8 @@
 	
 	public static final String PROPERTY_RUN_FROM_WORKSPACE = "runFromWorkspace";
 
+	public static final String PROPERTY_SELECT_CLASSPATH_CONTAINERS = "selectClasspathContainers";
+
 	public static final String CONSOLE_INFO = "--long";
 
 	public static final String CONSOLE_DEBUG = "-vv";
@@ -332,6 +334,13 @@
 		return getAttribute(PROPERTY_RUN_FROM_WORKSPACE, false);
 	}
 	
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.st.core.IGeronimoServer#isSelectClasspathContainers()
+	 */
+	public boolean isSelectClasspathContainers() {
+		return getAttribute(PROPERTY_SELECT_CLASSPATH_CONTAINERS, false);
+	}
+	
 	public void setInPlaceSharedLib(boolean enable) {
 		setAttribute(PROPERTY_IN_PLACE_SHARED_LIB, enable);
 	}
@@ -340,6 +349,10 @@
 		setAttribute(PROPERTY_RUN_FROM_WORKSPACE, enable);
 	}
 	
+	public void setSelectClasspathContainers(boolean enable) {
+		setAttribute(PROPERTY_SELECT_CLASSPATH_CONTAINERS, enable);
+	}
+	
 	public String discoverDeploymentFactoryClassName(IPath jarPath) {
 		try {
 			JarFile deployerJar = new JarFile(jarPath.toFile());
@@ -367,6 +380,7 @@
 		setPublishTimeout(900000);
 		setInPlaceSharedLib(false);
 		setRunFromWorkspace(false);
+		setSelectClasspathContainers(false);
 	}
 
 	public String getInstanceProperty(String name) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java
Tue Jan 29 18:16:49 2008
@@ -49,6 +49,8 @@
 	
 	public boolean isRunFromWorkspace();
 	
+	public boolean isSelectClasspathContainers();
+	
 	public int getPingDelay();
 	
 	public int getPingInterval();

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetSelectClasspathContainersCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetSelectClasspathContainersCommand.java?rev=616592&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetSelectClasspathContainersCommand.java
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetSelectClasspathContainersCommand.java
Tue Jan 29 18:16:49 2008
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.ui.commands;
+
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+
+public class SetSelectClasspathContainersCommand extends ServerCommand {
+
+    boolean value;
+    boolean oldValue;
+
+
+    /**
+     * @param server
+     * @param name
+     */
+    public SetSelectClasspathContainersCommand(IServerWorkingCopy server, boolean value)
{
+        super(server, "SetSelectClasspathContainersCommand");
+        this.value = value;
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.geronimo.st.ui.commands.ServerCommand#execute()
+     */
+    public void execute() {
+        GeronimoServerDelegate gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
+        oldValue = gs.isSelectClasspathContainers();
+        gs.setSelectClasspathContainers(value);
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.geronimo.st.ui.commands.ServerCommand#undo()
+     */
+    public void undo() {
+        GeronimoServerDelegate gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
+        gs.setSelectClasspathContainers(oldValue);
+    }
+
+}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
Tue Jan 29 18:16:49 2008
@@ -55,18 +55,18 @@
 	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
 	 */
 	public void doAddPages() throws PartInitException {
-        Trace.trace("Entry", "SharedDeploymentPlanEditor.doAddPages");
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.doAddPages");
 
 		if (getDeploymentPlan() != null && getLoader() != null) {
 			currentLoader.doAddPages(this);
 		}
 		addSourcePage();
 
-        Trace.trace("Exit", "SharedDeploymentPlanEditor.doAddPages");
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.doAddPages");
 	}
 
 	private static synchronized void loadExtensionPoints() {
-        Trace.trace("Entry", "SharedDeploymentPlanEditor.loadExtensionPoints");
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.loadExtensionPoints");
 
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID,
"loader");
@@ -78,13 +78,13 @@
 					String version = element.getAttribute("version");
 					loaders.put(version, loader);
 				} catch (CoreException e) {
-                    Trace.trace("CoreException", "SharedDeploymentPlanEditor.loadExtensionPoints");
+                    Trace.tracePoint("CoreException", "SharedDeploymentPlanEditor.loadExtensionPoints");
 					e.printStackTrace();
 				}
 			}
 		}
 
-        Trace.trace("Exit", "SharedDeploymentPlanEditor.loadExtensionPoints");
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.loadExtensionPoints");
 	}
 
 	/*
@@ -93,14 +93,14 @@
 	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
 	public EObject loadDeploymentPlan(IFile file) {
-        Trace.trace("Entry", "SharedDeploymentPlanEditor.loadDeploymentPlan", file);
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.loadDeploymentPlan", file);
 
-        Trace.trace("Exit", "SharedDeploymentPlanEditor.loadDeploymentPlan", (getLoader()
!= null ? currentLoader.loadDeploymentPlan(file) : null));
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.loadDeploymentPlan", (getLoader()
!= null ? currentLoader.loadDeploymentPlan(file) : null));
 		return getLoader() != null ? currentLoader.loadDeploymentPlan(file) : null;
 	}
 
 	private IGeronimoFormContentLoader getLoader() {
-        Trace.trace("Entry", "SharedDeploymentPlanEditor.getLoader");
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.getLoader");
 
 		if (currentLoader == null) {
 			IEditorInput input = getEditorInput();
@@ -112,16 +112,16 @@
 					String version = runtime.getRuntimeType().getVersion();
 					currentLoader = (IGeronimoFormContentLoader) loaders.get(version);
 				} catch (CoreException e) {
-                    Trace.trace("CoreException", "SharedDeploymentPlanEditor.getLoader");
+                    Trace.tracePoint("CoreException", "SharedDeploymentPlanEditor.getLoader");
 					e.printStackTrace();
 				} catch (IllegalArgumentException ie) {
-                    Trace.trace("IllegalArgumentException", "SharedDeploymentPlanEditor.getLoader");
+                    Trace.tracePoint("IllegalArgumentException", "SharedDeploymentPlanEditor.getLoader");
 				    throw new IllegalArgumentException("The project [" + project.getName() + "] does
not have a Targeted Runtime specified.");
                 }
 			}
 		}
 
-        Trace.trace("Exit", "SharedDeploymentPlanEditor.getLoader", currentLoader);
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.getLoader", currentLoader);
 		return currentLoader;
 	}
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java
Tue Jan 29 18:16:49 2008
@@ -43,6 +43,7 @@
 	public static String editorSectionTestEnvDescription;
 	public static String editorSectionRunFromWorkspace;
 	public static String editorSectionSharedLibrariesInPlace;
+	public static String editorSectionSelectClasspathContainers;
 	
 	public static String info;
 	public static String debug;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
Tue Jan 29 18:16:49 2008
@@ -59,7 +59,7 @@
 debug=DEBUG
 
 editorSectionVMArgsTitle=Server VM Arguments
-editorSectionVMArgsDescription=Specfiy the Java VM Arguments to be provided on server startup.
+editorSectionVMArgsDescription=Specify the Java VM Arguments to be provided on server startup.
 
 editorSectionStartupTitle=Server Startup
 editorSectionStartupDescription=Specify the server startup constraints.
@@ -224,4 +224,5 @@
 editorSectionTestEnvTitle=Test Environment
 editorSectionTestEnvDescription=Configure local test environment options.
 editorSectionSharedLibrariesInPlace=Enable in-place shared library support.
-editorSectionRunFromWorkspace=Run modules directly from workspace.
\ No newline at end of file
+editorSectionRunFromWorkspace=Run modules directly from workspace.
+editorSectionSelectClasspathContainers=Select the workspace classpath containers to be provided
to the server.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java
Tue Jan 29 18:16:49 2008
@@ -93,29 +93,29 @@
      *            or
      *            Return value if the trace point is an "Exit"
      */
-    public static void trace(String tracePoint, String classDotMethod) {
+    public static void tracePoint(String tracePoint, String classDotMethod) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
     }   
-    public static void trace(String tracePoint, String classDotMethod, Object parm1) {
+    public static void tracePoint(String tracePoint, String classDotMethod, Object parm1)
{
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null
? null : parm1.toString()) + "] )" );
     }
 
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object
parm2) {
+    public static void tracePoint(String tracePoint, String classDotMethod, Object parm1,
Object parm2) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null
? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null
? null : parm2.toString()) + "] )" );
     }
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object
parm2, Object parm3) {
+    public static void tracePoint(String tracePoint, String classDotMethod, Object parm1,
Object parm2, Object parm3) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null
? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null
? null : parm2.toString()) + "], " +
                                                                  "parm3=[" + (parm3 == null
? null : parm3.toString()) + "] )" );
     }
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object
parm2, Object parm3, Object parm4) {
+    public static void tracePoint(String tracePoint, String classDotMethod, Object parm1,
Object parm2, Object parm3, Object parm4) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null
? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null
? null : parm2.toString()) + "], " +
                                                                  "parm3=[" + (parm3 == null
? null : parm3.toString()) + "], " +
                                                                  "parm4=[" + (parm4 == null
? null : parm4.toString()) + "] )" );
     }
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object
parm2, Object parm3, Object parm4, Object parm5) {
+    public static void tracePoint(String tracePoint, String classDotMethod, Object parm1,
Object parm2, Object parm3, Object parm4, Object parm5) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null
? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null
? null : parm2.toString()) + "], " +
                                                                  "parm3=[" + (parm3 == null
? null : parm3.toString()) + "], " +

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorTestEnvSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorTestEnvSection.java?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorTestEnvSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorTestEnvSection.java
Tue Jan 29 18:16:49 2008
@@ -19,7 +19,9 @@
 import org.apache.geronimo.st.core.IGeronimoServer;
 import org.apache.geronimo.st.ui.commands.SetInPlaceSharedLibCommand;
 import org.apache.geronimo.st.ui.commands.SetRunFromWorkspaceCommand;
+import org.apache.geronimo.st.ui.commands.SetSelectClasspathContainersCommand;
 import org.apache.geronimo.st.ui.internal.Messages;
+import org.apache.geronimo.st.ui.internal.Trace;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -34,68 +36,102 @@
 
 public class ServerEditorTestEnvSection extends ServerEditorSection {
 
-	private Button runFromWorkspace;
+    // SWT widget(s)
+    private Button runFromWorkspace;
+    private Button inPlaceSharedLib;
+    private Button selectClasspathContainers = null;
+    private Composite composite = null;
 
-	private Button inPlaceSharedLib;
+    // Form widget(s)
+    private FormToolkit toolkit;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.server.ui.editor.ServerEditorSection#createSection(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createSection(Composite parent) {
-		super.createSection(parent);
-
-		FormToolkit toolkit = getFormToolkit(parent.getDisplay());
-
-		Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE
-				| ExpandableComposite.EXPANDED
-				| ExpandableComposite.TITLE_BAR
-				| Section.DESCRIPTION | ExpandableComposite.FOCUS_TITLE);
-
-		section.setText(Messages.editorSectionTestEnvTitle);
-		section.setDescription(Messages.editorSectionTestEnvDescription);
-		section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-
-		Composite composite = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = 5;
-		layout.marginWidth = 10;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 15;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		section.setClient(composite);
-		
-		IGeronimoServer gs = (IGeronimoServer) server.getAdapter(IGeronimoServer.class);
-
-		inPlaceSharedLib = toolkit.createButton(composite, Messages.editorSectionSharedLibrariesInPlace,
SWT.CHECK);
-		inPlaceSharedLib.setSelection(gs.isInPlaceSharedLib());
-		inPlaceSharedLib.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				execute(new SetInPlaceSharedLibCommand(server, inPlaceSharedLib
-						.getSelection()));
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-		});
-
-		runFromWorkspace = toolkit.createButton(composite, Messages.editorSectionRunFromWorkspace,
SWT.CHECK);
-		runFromWorkspace.setSelection(gs.isRunFromWorkspace());
-		runFromWorkspace.setEnabled(false);	//FIXME disable support until supported
-		runFromWorkspace.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				execute(new SetRunFromWorkspaceCommand(server, runFromWorkspace.getSelection()));
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-		});
-	}
-}
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.server.ui.editor.ServerEditorSection#createSection(org.eclipse.swt.widgets.Composite)
+     */
+    public void createSection(Composite parent) {
+        super.createSection(parent);
+
+        Trace.tracePoint("ENTRY", "ServerEditorTestEnvSection.createSection", parent);
+
+        toolkit = getFormToolkit(parent.getDisplay());
+
+        Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE
+                                                | ExpandableComposite.EXPANDED
+                                                | ExpandableComposite.TITLE_BAR
+                                                | Section.DESCRIPTION | ExpandableComposite.FOCUS_TITLE);
+
+        section.setText(Messages.editorSectionTestEnvTitle);
+        section.setDescription(Messages.editorSectionTestEnvDescription);
+        section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+
+        composite = toolkit.createComposite(section);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 1;
+        layout.marginHeight = 5;
+        layout.marginWidth = 10;
+        layout.verticalSpacing = 5;
+        layout.horizontalSpacing = 15;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+        section.setClient(composite);
+
+        IGeronimoServer gs = (IGeronimoServer) server.getAdapter(IGeronimoServer.class);
+
+
+        //
+        // inPlaceSharedLib Button
+        //
+        inPlaceSharedLib = toolkit.createButton(composite, Messages.editorSectionSharedLibrariesInPlace,
SWT.CHECK);
+        inPlaceSharedLib.setSelection(gs.isInPlaceSharedLib());
+        inPlaceSharedLib.addSelectionListener(new SelectionListener() {
+
+            public void widgetSelected(SelectionEvent e) {
+                execute(new SetInPlaceSharedLibCommand(server, inPlaceSharedLib.getSelection()));
+            }
+
+            public void widgetDefaultSelected(SelectionEvent e) {
+            }
+
+        });
+
+
+        //
+        // runFromWorkspace Button
+        //
+        runFromWorkspace = toolkit.createButton(composite, Messages.editorSectionRunFromWorkspace,
SWT.CHECK);
+        runFromWorkspace.setSelection(gs.isRunFromWorkspace());
+        runFromWorkspace.setEnabled(false); //FIXME disable support until supported
+        runFromWorkspace.addSelectionListener(new SelectionListener() {
+
+            public void widgetSelected(SelectionEvent e) {
+                execute(new SetRunFromWorkspaceCommand(server, runFromWorkspace.getSelection()));
+            }
+
+            public void widgetDefaultSelected(SelectionEvent e) {
+            }
+
+        });
+
+
+        //
+        // selectClasspathContainers Button
+        //
+        selectClasspathContainers = toolkit.createButton(composite, Messages.editorSectionSelectClasspathContainers,
SWT.CHECK); 
+        selectClasspathContainers.setSelection(gs.isSelectClasspathContainers()); 
+        selectClasspathContainers.addSelectionListener(new SelectionListener() { 
+
+            public void widgetSelected(SelectionEvent e) { 
+                execute(new SetSelectClasspathContainersCommand(server, selectClasspathContainers.getSelection()));

+            } 
+
+            public void widgetDefaultSelected(SelectionEvent e) { 
+            } 
+
+        }); 
+
+        Trace.tracePoint("EXIT", "ServerEditorTestEnvSection.createSection");
+    }
+}
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Trace.java?rev=616592&r1=616591&r2=616592&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Trace.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Trace.java
Tue Jan 29 18:16:49 2008
@@ -115,7 +115,7 @@
                                                                  "parm4=[" + (parm4 == null
? null : parm4.toString()) + "] )" );
     }
     public static void trace(String tracePoint, String classDotMethod, Object parm1, Object
parm2, Object parm3, Object parm4, Object parm5) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null
? null : parm1.toString()) + "], " +
+        trace(Trace.INFO, ggacePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null
? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null
? null : parm2.toString()) + "], " +
                                                                  "parm3=[" + (parm3 == null
? null : parm3.toString()) + "], " +
                                                                  "parm4=[" + (parm4 == null
? null : parm4.toString()) + "], " +



Mime
View raw message