This commit was manufactured by cvs2svn to create tag 'v20041112'.
diff --git a/plugins/org.eclipse.jst.server.core/.classpath b/plugins/org.eclipse.jst.server.core/.classpath
deleted file mode 100644
index a74595e..0000000
--- a/plugins/org.eclipse.jst.server.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sjavacore/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.server.core/.cvsignore b/plugins/org.eclipse.jst.server.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jst.server.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jst.server.core/.project b/plugins/org.eclipse.jst.server.core/.project
deleted file mode 100644
index 3062b1a..0000000
--- a/plugins/org.eclipse.jst.server.core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.core</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.server.core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.core/build.properties b/plugins/org.eclipse.jst.server.core/build.properties
deleted file mode 100644
index f87e0c4..0000000
--- a/plugins/org.eclipse.jst.server.core/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- *.jar,\
- plugin.properties,\
- sjavacore.jar
-jars.compile.order =
-src.includes = schema/,\
- build.properties
-output.sjavacore.jar = bin/
-source.sjavacore.jar = sjavacore/
diff --git a/plugins/org.eclipse.jst.server.core/plugin.properties b/plugins/org.eclipse.jst.server.core/plugin.properties
deleted file mode 100644
index 4dc017a..0000000
--- a/plugins/org.eclipse.jst.server.core/plugin.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Java Server Support
-providerName=IBM
-
-# Commands
-commandSetVMArguments=set VM arguments
-commandSetVMArgumentsDescription=Set the Java VM arguments
-commandSetPath=set system path
-commandSetPathDescription=Set the system path
-commandSetPathType=set system path option
-commandSetPathTypeDescription=Set the system path option
-commandAddSystemProperty=add system property
-commandAddSystemPropertyDescription=Add a system property
-commandModifySystemProperty=modify system property
-commandModifySystemPropertyDescription=Modify the system property
-commandRemoveSystemProperty=remove system property
-commandRemoveSystemPropertyDescription=Remove a system property
-commandAddToClasspath=add to class path
-commandAddToClasspathDescription=Add to the class path
-commandEditClasspath=edit class path
-commandEditClasspathDescription=Edit the class path
-commandReorderClasspath=reorder class path
-commandReorderClasspathDescrption=Reorder the class path
-commandRemoveFromClasspath=remove from class path
-commandRemoveFromClasspathDescription=Remove from the class path
-
-classpathContainerDescription=Server Classpath Container
-
-runtimeTypeName=J2EE Runtime Library
-runtimeTypeDescription=A runtime that represents a set of J2EE runtime libraries.
-
-errorName=Invalid name.
-errorLocation=Invalid location.
-errorJRE=Invalid JRE.
-errorDuplicateRuntimeName=Name is already in use.
-
-moduleTypeJ2EEWebName=J2EE Web module
-moduleTypeJ2EEEJBName=J2EE EJB module
-moduleTypeJ2EEEARName=J2EE Enterprise application
diff --git a/plugins/org.eclipse.jst.server.core/plugin.xml b/plugins/org.eclipse.jst.server.core/plugin.xml
deleted file mode 100644
index de93910..0000000
--- a/plugins/org.eclipse.jst.server.core/plugin.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin id="org.eclipse.jst.server.core"
- name="%pluginName"
- version="3.0.0"
- provider-name="%providerName"
- class="org.eclipse.jst.server.core.internal.JavaServerPlugin">
-
- <requires>
- <import plugin="org.eclipse.core.resources" />
- <import plugin="org.eclipse.debug.core" />
- <import plugin="org.eclipse.wst.server.core" />
- <import plugin="org.eclipse.jdt.core" />
- <import plugin="org.eclipse.jdt.launching" />
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-
- <runtime>
- <library name="sjavacore.jar">
- <export name="*"/>
- <packages prefixes="org.eclipse.jst.server.core,org.eclipse.jst.server.j2ee"/>
- </library>
- </runtime>
-
- <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
- <classpathContainerInitializer
- id="org.eclipse.jst.server.core.container"
- class="org.eclipse.jst.server.core.internal.RuntimeClasspathContainerInitializer"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.moduleKinds">
- <moduleKind
- id="j2ee.web"
- name="%moduleTypeJ2EEWebName"/>
- <moduleKind
- id="j2ee.ejb"
- name="%moduleTypeJ2EEEJBName"/>
- <moduleKind
- id="j2ee.ear"
- name="%moduleTypeJ2EEEARName"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.runtimeTypes">
- <runtimeType
- id="org.eclipse.jst.server.core.runtimeType"
- name="%runtimeTypeName"
- description="%runtimeTypeDescription"
- class="org.eclipse.jst.server.core.internal.GenericRuntime"
- workingCopyClass="org.eclipse.jst.server.core.internal.GenericRuntimeWorkingCopy">
- <moduleType
- types="j2ee"
- versions="*"/>
- <moduleType
- types="utility"
- versions="*"/>
- </runtimeType>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.runtimeTargetHandlers">
- <runtimeTargetHandler
- id="org.eclipse.jst.server.core.runtimeTarget"
- runtimeTypeIds="org.eclipse.jst.server.core.runtimeType"
- class="org.eclipse.jst.server.core.internal.GenericRuntimeTargetHandler"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/ClasspathRuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/ClasspathRuntimeTargetHandler.java
deleted file mode 100644
index 67808f4..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/ClasspathRuntimeTargetHandler.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.core.internal.JavaServerPlugin;
-import org.eclipse.jst.server.core.internal.RuntimeClasspathContainer;
-import org.eclipse.jst.server.core.internal.Trace;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.model.IRuntimeTargetHandlerDelegate;
-
-/**
- *
- */
-public abstract class ClasspathRuntimeTargetHandler implements IRuntimeTargetHandlerDelegate {
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IRuntimeTargetDelegate#setRuntimeTarget(org.eclipse.core.resources.IProject, org.eclipse.wst.server.core.IRuntime)
- */
- public void setRuntimeTarget(IProject project, IRuntime runtime, IProgressMonitor monitor) throws CoreException {
- if (project == null || runtime == null)
- return;
-
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- } catch (Exception e) {
- // ignore
- }
-
- if (javaProject == null)
- return;
-
- try {
- List list = new ArrayList();
- IClasspathEntry[] cp = javaProject.getRawClasspath();
- int size = cp.length;
- for (int i = 0; i < size; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- if (!cp[i].getPath().segment(0).equals(RuntimeClasspathContainer.SERVER_CONTAINER))
- list.add(cp[i]);
- } else
- list.add(cp[i]);
- }
-
- List add = new ArrayList();
- IClasspathEntry[] entries = getDelegateClasspathEntries(runtime);
- if (entries != null) {
- size = entries.length;
- for (int i = 0; i < size; i++)
- add.add(entries[i]);
- }
-
- String[] ids = getClasspathEntryIds(runtime);
- if (ids != null) {
- size = ids.length;
- for (int i = 0; i < size; i++) {
- IPath path = new Path(RuntimeClasspathContainer.SERVER_CONTAINER).append(getId()).append(runtime.getId());
- if (ids[i] != null)
- path.append(ids[i]);
- add.add(JavaCore.newContainerEntry(path));
- String id = "";
- if (path.segmentCount() > 3)
- id = path.segment(3);
- RuntimeClasspathContainer rcc = new RuntimeClasspathContainer(path, this, runtime, id);
- JavaCore.setClasspathContainer(path, new IJavaProject[] { javaProject}, new IClasspathContainer[] { rcc }, monitor);
- }
- }
-
- // clean up duplicates
- cleanupDuplicateClasspath(javaProject, list, add);
-
- Iterator iterator = add.iterator();
- while (iterator.hasNext()) {
- list.add(iterator.next());
- }
-
- cp = new IClasspathEntry[list.size()];
- list.toArray(cp);
- javaProject.setRawClasspath(cp, monitor);
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Error setting runtime target", e);
- throw new CoreException(new Status(IStatus.ERROR, JavaServerPlugin.PLUGIN_ID, 0, e.getLocalizedMessage(), e));
- }
- }
-
- protected void cleanupDuplicateClasspath(IJavaProject project, List current, List add) {
- // check if we even have to bother
- boolean sourceOnly = true;
- Iterator iterator = current.iterator();
- while (iterator.hasNext()) {
- IClasspathEntry entry = (IClasspathEntry) iterator.next();
- if (entry.getEntryKind() != IClasspathEntry.CPE_SOURCE)
- sourceOnly = false;
- }
- if (sourceOnly)
- return;
-
- // remove any of our own containers
- List remove = new ArrayList();
- iterator = current.iterator();
- while (iterator.hasNext()) {
- IClasspathEntry entry = (IClasspathEntry) iterator.next();
-
- if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- try {
- if (RuntimeClasspathContainer.SERVER_CONTAINER.equals(entry.getPath().segment(0))
- || JavaRuntime.JRE_CONTAINER.equals(entry.getPath().segment(0)))
- remove.add(entry);
- } catch (Exception e) {
- Trace.trace(Trace.FINEST, "Error resolving classpath container", e);
- }
- }
- }
-
- // expand the "add" list
- List addExpanded = new ArrayList();
- iterator = add.iterator();
- while (iterator.hasNext()) {
- IClasspathEntry entry = (IClasspathEntry) iterator.next();
- if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- try {
- IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
- IClasspathEntry[] entries = container.getClasspathEntries();
- int size = entries.length;
- for (int i = 0; i < size; i++) {
- if (entries[i] != null)
- addExpanded.add(entries[i]);
- }
- } catch (Exception e) {
- Trace.trace(Trace.FINEST, "Error resolving classpath container 2", e);
- }
- } else if (entry.getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
- entry = JavaCore.getResolvedClasspathEntry(entry);
- if (entry != null)
- addExpanded.add(entry);
- } else
- addExpanded.add(entry);
- }
-
- // check for duplicates by also expanding the current list
- iterator = current.iterator();
- while (iterator.hasNext()) {
- IClasspathEntry entry = (IClasspathEntry) iterator.next();
-
- List currentExpanded = new ArrayList();
- if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- try {
- IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
- IClasspathEntry[] entries = container.getClasspathEntries();
- int size = entries.length;
- for (int i = 0; i < size; i++) {
- if (entries[i] != null)
- currentExpanded.add(entries[i]);
- }
- } catch (Exception e) {
- Trace.trace(Trace.FINEST, "Error resolving classpath container 3", e);
- }
- } else if (entry.getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
- entry = JavaCore.getResolvedClasspathEntry(entry);
- if (entry != null)
- currentExpanded.add(entry);
- } else
- currentExpanded.add(entry);
-
- // loop over all of the expanded entries of this current entry
- boolean dup = false;
- Iterator iterator2 = currentExpanded.iterator();
- while (!dup && iterator2.hasNext()) {
- IClasspathEntry entry2 = (IClasspathEntry) iterator2.next();
- Iterator iterator3 = addExpanded.iterator();
- while (iterator3.hasNext()) {
- IClasspathEntry entry3 = (IClasspathEntry) iterator3.next();
- if (entry3.getPath().equals(entry2.getPath()))
- dup = true;
- }
- }
- if (dup && !remove.contains(entry))
- remove.add(entry);
- }
-
- // remove duplicates
- iterator = remove.iterator();
- while (iterator.hasNext()) {
- current.remove(iterator.next());
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IRuntimeTargetDelegate#removeRuntimeTarget(org.eclipse.core.resources.IProject, org.eclipse.wst.server.core.IRuntime)
- */
- public void removeRuntimeTarget(IProject project, IRuntime runtime, IProgressMonitor monitor) {
- Trace.trace(Trace.FINEST, "Removing runtime target");
- if (project == null || runtime == null)
- return;
-
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- } catch (Exception e) {
- // ignore
- }
-
- if (javaProject == null)
- return;
-
- try {
- IClasspathEntry[] delegates = getDelegateClasspathEntries(runtime);
- int delegateSize = 0;
- if (delegates != null)
- delegateSize = delegates.length;
-
- List list = new ArrayList();
- IClasspathEntry[] cp = javaProject.getRawClasspath();
- int size = cp.length;
- for (int i = 0; i < size; i++) {
- boolean remove = false;
-
- if (cp[i].getPath().segment(0).equals(RuntimeClasspathContainer.SERVER_CONTAINER))
- remove = true;
-
- for (int j = 0; j < delegateSize; j++) {
- if (cp[i].equals(delegates[j]))
- remove = true;
- }
- if (!remove)
- list.add(cp[i]);
- }
-
- cp = new IClasspathEntry[list.size()];
- list.toArray(cp);
- javaProject.setRawClasspath(cp, monitor);
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Error removing runtime target", e);
- }
- }
-
- protected static void addJarFiles(File dir, List list, boolean includeSubdirectories) {
- int depth = 0;
- if (includeSubdirectories)
- depth = 2;
- addJarFiles(dir, list, depth);
- }
-
- private static void addJarFiles(File dir, List list, int depth) {
- File[] files = dir.listFiles();
- if (files != null) {
- int size = files.length;
- for (int i = 0; i < size; i++) {
- if (files[i].isDirectory() && depth > 0) {
- addJarFiles(files[i], list, depth - 1);
- } else if (files[i].getAbsolutePath().endsWith(".jar") || files[i].getAbsolutePath().endsWith(".zip")) {
- IPath path = new Path(files[i].getAbsolutePath());
- list.add(JavaCore.newLibraryEntry(path, null, null));
- }
- }
- }
- }
-
- protected static void addLibraryEntries(List list, File dir, boolean includeSubdirectories) {
- addJarFiles(dir, list, includeSubdirectories);
- }
-
- protected static void addLibraryEntry(List list, File dir) {
- IPath path = new Path(dir.getAbsolutePath());
- list.add(JavaCore.newLibraryEntry(path, null, null));
- }
-
- protected static void addLibraryEntry(List list, IPath path) {
- list.add(JavaCore.newLibraryEntry(path, null, null));
- }
-
- protected static void addLibraryEntry(List list, IPath path, IPath source, IPath root) {
- list.add(JavaCore.newLibraryEntry(path, source, root));
- }
-
- protected static IClasspathEntry[] resolveList(List list) {
- IClasspathEntry[] entries = new IClasspathEntry[list.size()];
- list.toArray(entries);
- return entries;
- }
-
- public abstract String getId();
-
- public IClasspathEntry[] getDelegateClasspathEntries(IRuntime runtime) {
- return null;
- }
-
- public String[] getClasspathEntryIds(IRuntime runtime) {
- return null;
- }
-
- public abstract String getClasspathContainerLabel(IRuntime runtime, String id);
-
- public abstract IClasspathEntry[] resolveClasspathContainer(IRuntime runtime, String id);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/GenericRuntimeUtil.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/GenericRuntimeUtil.java
deleted file mode 100644
index 42cac9b..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/GenericRuntimeUtil.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- * Utility methods for the generic J2EE runtime.
- */
-public class GenericRuntimeUtil {
- protected static final String RUNTIME_TYPE_ID = "org.eclipse.jst.server.core.runtimeType";
-
- public static boolean isGenericJ2EERuntime(IRuntime runtime) {
- return (runtime != null && runtime.getRuntimeType() != null &&
- runtime.getRuntimeType().getId().startsWith(RUNTIME_TYPE_ID));
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IGenericRuntime.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IGenericRuntime.java
deleted file mode 100644
index 60b3041..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IGenericRuntime.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.launching.IVMInstall;
-
-import org.eclipse.wst.server.core.model.IRuntimeDelegate;
-/**
- *
- */
-public interface IGenericRuntime extends IRuntimeDelegate {
- public String getVMInstallTypeId();
-
- public String getVMInstallId();
-
- public IVMInstall getVMInstall();
-
- public IStatus validate();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IGenericRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IGenericRuntimeWorkingCopy.java
deleted file mode 100644
index 8182e0f..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IGenericRuntimeWorkingCopy.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-
-import org.eclipse.wst.server.core.model.IRuntimeWorkingCopyDelegate;
-/**
- *
- */
-public interface IGenericRuntimeWorkingCopy extends IGenericRuntime, IRuntimeWorkingCopyDelegate {
- public void setVMInstall(String typeId, String id);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JavaResources.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JavaResources.java
deleted file mode 100644
index 742997d..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JavaResources.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-
-import org.eclipse.jst.server.core.internal.JavaServerPlugin;
-/**
- *
- */
-public class JavaResources {
- /**
- * Returns the translated String found with the given key.
- *
- * @param key java.lang.String
- * @return java.lang.String
- */
- public static String getResource(String key) {
- return JavaServerPlugin.getResource(key);
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given arguments using java.text.MessageFormat.
- *
- * @param key java.lang.String
- * @param arguments java.lang.Object[]
- * @return java.lang.String
- */
- public static String getResource(String key, Object[] arguments) {
- return JavaServerPlugin.getResource(key, arguments);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/LaunchConfigurationUtil.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/LaunchConfigurationUtil.java
deleted file mode 100644
index 97d04d9..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/LaunchConfigurationUtil.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-import org.eclipse.wst.server.core.IServer;
-/**
- *
- */
-public class LaunchConfigurationUtil {
- /**
- * Gets the classpath from the launch configuration of the given server.
- * If create is false, it will return null if there is no launch configuration
- * (i.e. the server has not been run before) If create is true, it will create
- * a launch configuration if one does not exist.
- *
- * @param server
- * @param create
- * @return
- * @throws CoreException
- */
- public static IRuntimeClasspathEntry[] getClasspath(IServer server, boolean create) throws CoreException {
- ILaunchConfiguration config = server.getLaunchConfiguration(create);
- if (config == null)
- return null;
-
- return JavaRuntime.computeUnresolvedRuntimeClasspath(config);
- }
-
- /**
- * Sets the classpath on the given server's launch configuration.
- *
- * @param server
- * @param classpath
- * @throws CoreException
- */
- public static void setClasspath(IServer server, IRuntimeClasspathEntry[] classpath) throws CoreException {
- ILaunchConfiguration config = server.getLaunchConfiguration(true);
- ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-
- List mementos = new ArrayList(classpath.length);
- for (int i = 0; i < classpath.length; i++) {
- IRuntimeClasspathEntry entry = classpath[i];
- mementos.add(entry.getMemento());
- }
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, mementos);
- wc.doSave();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/SystemProperty.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/SystemProperty.java
deleted file mode 100644
index c884c30..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/SystemProperty.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-/**
- * A system property name/value pair.
- */
-public class SystemProperty {
- protected String name;
- protected String value;
-
- /**
- * SystemProperty constructor comment.
- */
- public SystemProperty(String name, String value) {
- super();
- this.name = name;
- this.value = value;
- }
-
- /**
- * Returns true if the object is a SystemProperty and has
- * the same name and value.
- *
- * @param obj java.lang.Object
- * @return boolean
- */
- public boolean equals(Object obj) {
- if (!(obj instanceof SystemProperty))
- return false;
-
- SystemProperty sp = (SystemProperty) obj;
- return (name != null && name.equals(sp.getName()) &&
- value != null && value.equals(sp.getValue()));
- }
-
- /**
- * Returns the property name.
- *
- * @return java.lang.String
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the property value.
- *
- * @return java.lang.String
- */
- public String getValue() {
- return value;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/Util.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/Util.java
deleted file mode 100644
index 9534967..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/Util.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.wst.server.core.internal.Trace;
-/**
- *
- */
-public class Util {
- /**
- * Returns the types contained within this java element.
- * @param element org.eclipse.jdt.core.api.IJavaElement
- * @return org.eclipse.jdt.core.api.IType[]
- */
- private static IType[] getTypes(IJavaElement element) {
- try {
- if (element.getElementType() != IJavaElement.COMPILATION_UNIT)
- return null;
-
- return ((ICompilationUnit) element).getAllTypes();
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * If this resource is a servlet, return the class name.
- * If not, return null.
- * @param resource
- * @return java.lang.String
- */
- public static String getServletClassName(IResource resource) {
- if (resource == null)
- return null;
-
- try {
- IProject project = resource.getProject();
- IPath path = resource.getFullPath();
- if (!project.hasNature(JavaCore.NATURE_ID) || path == null)
- return null;
-
- IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (!javaProject.isOpen())
- javaProject.open(new NullProgressMonitor());
-
- // output location may not be on classpath
- IPath outputPath = javaProject.getOutputLocation();
- if (outputPath != null && "class".equals(path.getFileExtension()) && outputPath.isPrefixOf(path)) {
- int count = outputPath.segmentCount();
- path = path.removeFirstSegments(count);
- }
-
- // remove initial part of classpath
- IClasspathEntry[] classPathEntry = javaProject.getResolvedClasspath(true);
- if (classPathEntry != null) {
- int size = classPathEntry.length;
- for (int i = 0; i < size; i++) {
- IPath classPath = classPathEntry[i].getPath();
- if (classPath.isPrefixOf(path)) {
- int count = classPath.segmentCount();
- path = path.removeFirstSegments(count);
- i += size;
- }
- }
- }
-
- // get java element
- IJavaElement javaElement = javaProject.findElement(path);
-
- IType[] types = getTypes(javaElement);
- if (types != null) {
- int size2 = types.length;
- for (int i = 0; i < size2; i++) {
- if (isServlet(types[i]))
- return types[i].getFullyQualifiedName();
- }
- }
- return null;
- } catch (Exception e) {
- Trace.trace("Could not find servlet class", e);
- return null;
- }
- }
-
- /**
- * Returns true if this java type derives from javax.servlet.GenericServlet
- * @param type org.eclipse.jdt.core.api.IType
- * @return boolean
- */
- private static boolean isServlet(IType type) {
- try {
- ITypeHierarchy hierarchy = type.newSupertypeHierarchy(null);
- IType[] superClasses = hierarchy.getAllSuperclasses(type);
-
- int size = superClasses.length;
- for (int i = 0; i < size; i++) {
- if ("javax.servlet.GenericServlet".equals(superClasses[i].getFullyQualifiedName()))
- return true;
- }
- return false;
- } catch (Exception e) {
- return false;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntime.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntime.java
deleted file mode 100644
index 6959f4c..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntime.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core.internal;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.core.IGenericRuntime;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- *
- */
-public class GenericRuntime implements IGenericRuntime {
- protected static final String PROP_VM_INSTALL_TYPE_ID = "vm-install-type-id";
- protected static final String PROP_VM_INSTALL_ID = "vm-install-id";
-
- protected IRuntime runtime;
-
- public GenericRuntime() {
- // do nothing
- }
-
- public void initialize(IRuntime newRuntime) {
- this.runtime = newRuntime;
- }
-
- public String getVMInstallTypeId() {
- return runtime.getAttribute(PROP_VM_INSTALL_TYPE_ID, (String)null);
- }
-
- public String getVMInstallId() {
- return runtime.getAttribute(PROP_VM_INSTALL_ID, (String)null);
- }
-
- public IVMInstall getVMInstall() {
- try {
- IVMInstallType vmInstallType = JavaRuntime.getVMInstallType(getVMInstallTypeId());
- IVMInstall[] vmInstalls = vmInstallType.getVMInstalls();
- int size = vmInstalls.length;
- String id = getVMInstallId();
- for (int i = 0; i < size; i++) {
- if (id.equals(vmInstalls[i].getId()))
- return vmInstalls[i];
- }
- } catch (Exception e) {
- // ignore
- }
- return null;
- }
-
- public IStatus validate() {
- if (runtime.getName() == null || runtime.getName().length() == 0)
- return new Status(IStatus.ERROR, JavaServerPlugin.PLUGIN_ID, 0, JavaServerPlugin.getResource("%errorName"), null);
-
- if (ServerUtil.isNameInUse(runtime))
- return new Status(IStatus.ERROR, JavaServerPlugin.PLUGIN_ID, 0, JavaServerPlugin.getResource("%errorDuplicateRuntimeName"), null);
-
- IPath path = runtime.getLocation();
- if (path == null || path.isEmpty())
- return new Status(IStatus.ERROR, JavaServerPlugin.PLUGIN_ID, 0, "", null);
- else if (!path.toFile().exists())
- return new Status(IStatus.ERROR, JavaServerPlugin.PLUGIN_ID, 0, JavaServerPlugin.getResource("%errorLocation"), null);
- else if (getVMInstall() == null)
- return new Status(IStatus.ERROR, JavaServerPlugin.PLUGIN_ID, 0, JavaServerPlugin.getResource("%errorJRE"), null);
- else
- return new Status(IStatus.OK, JavaServerPlugin.PLUGIN_ID, 0, "", null);
- }
-
- public void dispose() {
- // do nothing
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntimeTargetHandler.java
deleted file mode 100644
index 254e749..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntimeTargetHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.core.ClasspathRuntimeTargetHandler;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public class GenericRuntimeTargetHandler extends ClasspathRuntimeTargetHandler {
- public IClasspathEntry[] getDelegateClasspathEntries(IRuntime runtime) {
- GenericRuntime genericRuntime = (GenericRuntime) runtime.getDelegate();
- IVMInstall vmInstall = genericRuntime.getVMInstall();
- if (vmInstall != null) {
- String name = vmInstall.getName();
- return new IClasspathEntry[] { JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER).append("org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType").append(name)) };
- }
- return null;
- }
-
- public String getClasspathContainerLabel(IRuntime runtime, String id) {
- return JavaServerPlugin.getResource("%runtimeTargetContainer");
- }
-
- public String[] getClasspathEntryIds(IRuntime runtime) {
- return new String[1];
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.target.IServerTargetDelegate#getClasspathEntries()
- */
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime, String id) {
- IPath installPath = runtime.getLocation();
-
- if (installPath == null)
- return new IClasspathEntry[0];
-
- List list = new ArrayList();
- addLibraryEntries(list, installPath.toFile(), false);
- return resolveList(list);
- }
-
- public String getId() {
- return "org.eclipse.jst.server.core.runtimeTarget";
- }
-}
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntimeWorkingCopy.java
deleted file mode 100644
index ed684d7..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/GenericRuntimeWorkingCopy.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.core.IGenericRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-/**
- *
- */
-public class GenericRuntimeWorkingCopy extends GenericRuntime implements IGenericRuntimeWorkingCopy {
- protected IRuntimeWorkingCopy wc;
-
- public void initialize(IRuntimeWorkingCopy runtime2) {
- wc = runtime2;
- }
-
- public void setDefaults() {
- IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
- setVMInstall(vmInstall.getVMInstallType().getId(), vmInstall.getId());
- }
-
- public void setVMInstall(String typeId, String id) {
- if (typeId == null)
- wc.setAttribute(PROP_VM_INSTALL_TYPE_ID, (String)null);
- else
- wc.setAttribute(PROP_VM_INSTALL_TYPE_ID, typeId);
-
- if (id == null)
- wc.setAttribute(PROP_VM_INSTALL_ID, (String)null);
- else
- wc.setAttribute(PROP_VM_INSTALL_ID, id);
- }
-
- public void handleSave(byte id, IProgressMonitor monitor) {
- // do nothing
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/JavaServerPlugin.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
deleted file mode 100644
index 605e475..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core.internal;
-
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.*;
-/**
- * The main server tooling plugin class.
- */
-public class JavaServerPlugin extends Plugin {
- // server java plugin id
- public static final String PLUGIN_ID = "org.eclipse.jst.server.core";
-
- // singleton instance of this class
- private static JavaServerPlugin singleton;
-
- /**
- * Create the JavaServerPlugin.
- */
- public JavaServerPlugin() {
- super();
- singleton = this;
- }
-
- /**
- * Returns the singleton instance of this plugin.
- *
- * @return org.eclipse.jst.server.JavaServerPlugin
- */
- public static JavaServerPlugin getInstance() {
- return singleton;
- }
-
- /**
- * Returns the translated String found with the given key.
- *
- * @param key java.lang.String
- * @return java.lang.String
- */
- public static String getResource(String key) {
- try {
- return Platform.getResourceString(getInstance().getBundle(), key);
- } catch (Exception e) {
- return key;
- }
- }
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given arguments using java.text.MessageFormat.
- *
- * @param key java.lang.String
- * @param arguments java.lang.Object[]
- * @return java.lang.String
- */
- public static String getResource(String key, Object[] arguments) {
- try {
- String text = getResource(key);
- return MessageFormat.format(text, arguments);
- } catch (Exception e) {
- return key;
- }
- }
-
- /**
- * Convenience method for logging.
- *
- * @param status org.eclipse.core.runtime.IStatus
- */
- public static void log(IStatus status) {
- getInstance().getLog().log(status);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeClasspathContainer.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeClasspathContainer.java
deleted file mode 100644
index b08e363..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeClasspathContainer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core.internal;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.server.core.ClasspathRuntimeTargetHandler;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public class RuntimeClasspathContainer implements IClasspathContainer {
- public static final String SERVER_CONTAINER = JavaServerPlugin.PLUGIN_ID + ".container";
-
- private IPath path;
- private ClasspathRuntimeTargetHandler delegate;
- private IRuntime runtime;
-
- private String id;
-
- public RuntimeClasspathContainer(IPath path, ClasspathRuntimeTargetHandler delegate, IRuntime runtime, String id) {
- this.path = path;
- this.delegate = delegate;
- this.runtime = runtime;
- this.id = id;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
- */
- public IClasspathEntry[] getClasspathEntries() {
- IClasspathEntry[] entries = null;
- if (delegate != null && runtime != null)
- entries = delegate.resolveClasspathContainer(runtime, id);
-
- if (entries == null)
- return new IClasspathEntry[0];
-
- return entries;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getDescription()
- */
- public String getDescription() {
- String s = delegate.getClasspathContainerLabel(runtime, id);
-
- if (s != null)
- return s;
-
- return JavaServerPlugin.getResource("%classpathContainerDescription");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getKind()
- */
- public int getKind() {
- return IClasspathContainer.K_APPLICATION;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.IClasspathContainer#getPath()
- */
- public IPath getPath() {
- return path;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java
deleted file mode 100644
index d99ce6a..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jst.server.core.ClasspathRuntimeTargetHandler;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeTargetHandler;
-import org.eclipse.wst.server.core.ServerCore;
-/**
- *
- */
-public class RuntimeClasspathContainerInitializer extends ClasspathContainerInitializer {
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.ClasspathContainerInitializer#initialize(org.eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
- */
- public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
- if (containerPath.segmentCount() > 0) {
- if (containerPath.segment(0).equals(RuntimeClasspathContainer.SERVER_CONTAINER)) {
- ClasspathRuntimeTargetHandler delegate = null;
- IRuntime runtime = null;
- String id = "";
- if (containerPath.segmentCount() > 2) {
- IRuntimeTargetHandler handler = ServerCore.getRuntimeTargetHandler(containerPath.segment(1));
- if (handler != null)
- delegate = (ClasspathRuntimeTargetHandler) handler.getDelegate();
- String runtimeId = containerPath.segment(2);
- runtime = ServerCore.getResourceManager().getRuntime(runtimeId);
- if (containerPath.segmentCount() > 3)
- id = containerPath.segment(3);
- }
- RuntimeClasspathContainer container = new RuntimeClasspathContainer(containerPath, delegate, runtime, id);
- JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {project}, new IClasspathContainer[] {container}, null);
- }
- }
- }
-
- /**
- * @see org.eclipse.jdt.core.ClasspathContainerInitializer#getDescription(org.eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
- */
- public String getDescription(IPath containerPath, IJavaProject project) {
- return JavaServerPlugin.getResource("%classpathContainerDescription");
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/Trace.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/Trace.java
deleted file mode 100644
index 51273c9..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/Trace.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.core.internal;
-/**
- * Helper class to route trace output.
- */
-public class Trace {
- public static byte CONFIG = 0;
- public static byte WARNING = 1;
- public static byte SEVERE = 2;
- public static byte FINEST = 3;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(byte level, String s) {
- Trace.trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param s java.lang.String
- * @param t java.lang.Throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (!JavaServerPlugin.getInstance().isDebugging())
- return;
-
- System.out.println(s);
- if (t != null)
- t.printStackTrace();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/EJBBean.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/EJBBean.java
deleted file mode 100644
index a098867..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/EJBBean.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleObject;
-
-public class EJBBean implements IModuleObject {
- public static final String ID = "org.eclipse.jst.server.j2ee.ejb";
-
- private IModule module;
- private String jndiName;
- private boolean local;
- private boolean remote;
-
- /**
- * @deprecated - use the other constructor
- * @param module
- * @param ejbName
- */
- public EJBBean(IModule module, String ejbName) {
- this.module = module;
- this.jndiName = ejbName;
- }
-
- public EJBBean(IModule module, String jndiName, boolean remote, boolean local) {
- this.module = module;
- this.jndiName = jndiName;
- this.remote = remote;
- this.local = local;
- }
-
- /*
- * @see IModuleObject#getId()
- */
- public String getId() {
- return ID;
- }
-
- /*
- * @see IModuleObject#getModule()
- */
- public IModule getModule() {
- return module;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- public boolean hasRemoteInterface() {
- return remote;
- }
-
- public boolean hasLocalInterface() {
- return local;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IApplicationClientModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IApplicationClientModule.java
deleted file mode 100644
index 5230890..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IApplicationClientModule.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-public interface IApplicationClientModule extends IJ2EEModule {
- // no additional methods
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IConnectorModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IConnectorModule.java
deleted file mode 100644
index e39dcb4..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IConnectorModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import java.util.List;
-/**
- * A J2EE connector module.
- */
-public interface IConnectorModule extends IJ2EEModule {
- /**
- * Returns the classpath as a list of absolute IPaths.
- *
- * @param java.util.List
- */
- public List getClasspath();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IEJBModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IEJBModule.java
deleted file mode 100644
index 5defe37..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IEJBModule.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-public interface IEJBModule extends IJ2EEModule {
- /**
- * Returns a version number in the form "x.y.z".
- *
- * @return java.lang.String
- */
- public String getEJBSpecificationVersion();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IEnterpriseApplication.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IEnterpriseApplication.java
deleted file mode 100644
index 4f25930..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IEnterpriseApplication.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.wst.server.core.model.IModule;
-/**
- *
- */
-public interface IEnterpriseApplication extends IModule {
- /**
- * Returns a version number in the form "x.y.z".
- *
- * @return java.lang.String
- */
- public String getJ2EESpecificationVersion();
-
- /**
- * Returns the modules contained within this EAR.
- *
- * @return org.eclipse.jst.server.j2ee.IJ2EEModule[]
- */
- public IJ2EEModule[] getModules();
-
- /**
- * Returns the URI of the given J2EE module within this
- * enterprise application.
- *
- * @param org.eclipse.jst.server.j2ee.IJ2EEModule
- * @return java.lang.String
- */
- public String getURI(IJ2EEModule module);
-
- /**
- * Returns true if this EAR supports loose modules.
- *
- * @return boolean
- */
- public boolean containsLooseModules();
-
- /**
- * Returns the location of the root of the application. May
- * return null if isUnitTest() returns false. This should
- * be an absolute path that is not workbench relative.
- *
- * @return org.eclipse.core.runtime.IPath
- */
- public IPath getLocation();
-}
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IJ2EEModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IJ2EEModule.java
deleted file mode 100644
index ae79fd2..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IJ2EEModule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.wst.server.core.model.IModule;
-/**
- * An abstract J2EE module that can be deployed to a server.
- */
-public interface IJ2EEModule extends IModule {
- /**
- * Returns a version number in the form "x.y.z".
- *
- * @param java.lang.String
- */
- public String getJ2EESpecificationVersion();
-
- /**
- * Returns the location of the root of the module. May
- * return null if isUnitTest() returns false. This should
- * be an absolute path that is not workbench relative.
- *
- * @return org.eclipse.core.runtime.IPath
- */
- public IPath getLocation();
-
- /**
- * Returns true if this is a binary (zipped) module, and
- * false if it is expanded.
- *
- * <p>If true, members() should return only a single element -
- * the binary (jar or zip file) that contains the contents of
- * this module. (a single IModuleResource, e.g.
- * myejb.jar) Also, getLocation() should return the full path
- * up to and including the binary itself. (e.g.
- * c:\temp\myejb.jar)</p>
- *
- * <p>If false, members() should return the entire contents
- * of the module, starting at the root. There should be no
- * preceeding directory structure. (an array of
- * IModuleResources, e.g. index.html, WEB-INF/web.xml,
- * ...) In this case, getLocation() should return the path to
- * the root folder containing these resources.</p>
- *
- * @return boolean
- */
- public boolean isBinary();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/ILooseArchive.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/ILooseArchive.java
deleted file mode 100644
index fe63c0d..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/ILooseArchive.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.wst.server.core.model.IModule;
-/**
- *
- */
-public interface ILooseArchive extends IModule {
- /**
- * Returns the location of the root of the loose utility. This should
- * be an absolute path that is not workbench relative.
- *
- * @return org.eclipse.core.runtime.IPath
- */
- public IPath getLocation();
-
- /**
- * Returns true if this is a binary (zipped) archive, and
- * false if it is expanded.
- *
- * <p>If true, members() should return only a single element -
- * the binary (jar or zip file) that contains the contents of
- * this module. (a single IPublishableResource, e.g.
- * myejb.jar) Also, getLocation() should return the full path
- * up to and including the binary itself. (e.g.
- * c:\temp\myejb.jar)</p>
- *
- * <p>If false, members() should return the entire contents
- * of the module, starting at the root. There should be no
- * preceeding directory structure. (an array of
- * IPublishableResources, e.g. index.html, WEB-INF/web.xml,
- * ...) In this case, getLocation() should return the path to
- * the root folder containing these resources.</p>
- *
- * @return boolean
- */
- public boolean isBinary();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/ILooseArchiveSupport.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/ILooseArchiveSupport.java
deleted file mode 100644
index bb9e381..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/ILooseArchiveSupport.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-public interface ILooseArchiveSupport {
- /**
- * Return the loose archives that are contained within this enterprise
- * application.
- *
- * @return ILooseArchive[]
- */
- public ILooseArchive[] getLooseArchives();
-
- /**
- * Returns the URI of the given loose archive within this
- * enterprise application.
- *
- * @param com.ibm.etools.server.j2ee.ILooseArchive
- * @return java.lang.String
- */
- public String getURI(ILooseArchive jar);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IStaticWeb.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IStaticWeb.java
deleted file mode 100644
index 7a17d22..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IStaticWeb.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.wst.server.core.model.IModule;
-/**
- * A static Web module that could be deployed to Apache or another
- * HTTP server.
- */
-public interface IStaticWeb extends IModule {
- /**
- * Returns the context root of the Web.
- *
- * @return java.lang.String
- */
- public String getContextRoot();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IWebModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IWebModule.java
deleted file mode 100644
index 848033f..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/IWebModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-public interface IWebModule extends IJ2EEModule {
- /**
- * Returns a version number in the form "x.y.z".
- *
- * @return java.lang.String
- */
- public String getServletSpecificationVersion();
-
- /**
- * Returns a version number in the form "x.y.z".
- *
- * @return java.lang.String
- */
- public String getJSPSpecificationVersion();
-
- /**
- * Returns the context root of the module.
- *
- * @return java.lang.String
- */
- public String getContextRoot();
-
- /**
- * Returns false if the files in this module are placed in the
- * correct structure for testing before publishing. Returns true
- * if the file system resources must be published before they will
- * work.
- *
- * @return boolean
- */
- public boolean isPublishRequired();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/J2EEUtil.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/J2EEUtil.java
deleted file mode 100644
index 1e04376..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/J2EEUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IModule;
-/**
- *
- */
-public class J2EEUtil {
- /**
- * Returns the enterprise applications that the module is contained within.
- *
- * @param module org.eclipse.jst.server.j2ee.IJ2EEModule
- * @return org.eclipse.jst.server.j2ee.IEnterpriseApplication
- */
- public static IEnterpriseApplication[] getEnterpriseApplications(IJ2EEModule module) {
- Iterator iterator = ServerUtil.getModules("j2ee.ear", "*", false).iterator();
- List list = new ArrayList();
- while (iterator.hasNext()) {
- IModule module2 = (IModule) iterator.next();
- if (module2 instanceof IEnterpriseApplication) {
- IEnterpriseApplication ear = (IEnterpriseApplication) module2;
- IJ2EEModule[] modules = ear.getModules();
- if (modules != null) {
- int size = modules.length;
- for (int i = 0; i < size; i++) {
- if (modules[i].equals(module))
- list.add(ear);
- }
- }
- }
- }
- IEnterpriseApplication[] ears = new IEnterpriseApplication[list.size()];
- list.toArray(ears);
- return ears;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/JndiLaunchable.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/JndiLaunchable.java
deleted file mode 100644
index cae4c73..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/JndiLaunchable.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import java.util.Properties;
-
-import org.eclipse.wst.server.core.model.ILaunchable;
-/**
- *
- */
-public class JndiLaunchable implements ILaunchable {
- public static final String ID = "jndi";
-
- private Properties props;
- private String jndiName;
- private String server;
- private int port;
-
- public JndiLaunchable(Properties props, String jndiName) {
- this.jndiName = jndiName;
- this.props = props;
- }
-
- /*
- * @see ILaunchable#getId()
- */
- public String getId() {
- return ID;
- }
-
- public Properties getProperties() {
- return props;
- }
-
- public String getJNDIName() {
- return jndiName;
- }
-
- public String getServer() {
- return server;
- }
-
- public int getHTTPPort() {
- return port;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/JndiObject.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/JndiObject.java
deleted file mode 100644
index 3161ec3..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/JndiObject.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleObject;
-/**
- *
- */
-public class JndiObject implements IModuleObject {
- public static final String ID = "org.eclipse.jst.server.j2ee.jndi";
-
- private IModule module;
- private String jndiName;
-
- public JndiObject(IModule module, String jndiName) {
- this.module = module;
- this.jndiName = jndiName;
- }
-
- public String getId() {
- return ID;
- }
-
- public IModule getModule() {
- return module;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/Servlet.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/Servlet.java
deleted file mode 100644
index b4a05fc..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/Servlet.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleObject;
-/**
- *
- */
-public class Servlet implements IModuleObject {
- public static final String ID = "org.eclipse.jst.server.j2ee.servlet";
-
- private IModule module;
- private String className;
- private String alias;
-
- public Servlet(IModule module, String className, String alias) {
- this.module = module;
- this.className = className;
- this.alias = alias;
- }
-
- public String getId() {
- return ID;
- }
-
- public IModule getModule() {
- return module;
- }
-
- public String getServletClassName() {
- return className;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public String toString() {
- return "Servlet [module=" + module + ", class=" + className + ", alias=" + alias + "]";
- }
-}
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/WebResource.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/WebResource.java
deleted file mode 100644
index 4118747..0000000
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/j2ee/WebResource.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.j2ee;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleObject;
-/**
- *
- */
-public class WebResource implements IModuleObject {
- public static final String ID = "org.eclipse.jst.server.j2ee.webresource";
-
- private IModule module;
- private IPath path;
-
- public WebResource(IModule module, IPath path) {
- this.module = module;
- this.path = path;
- }
-
- public String getId() {
- return ID;
- }
-
- public IModule getModule() {
- return module;
- }
-
- public IPath getPath() {
- return path;
- }
-
- public String toString() {
- return "WebResource [module=" + module + ", path=" + path + "]";
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/.classpath b/plugins/org.eclipse.jst.server.generic.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.server.generic.core/.cvsignore b/plugins/org.eclipse.jst.server.generic.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jst.server.generic.core/.project b/plugins/org.eclipse.jst.server.generic.core/.project
deleted file mode 100644
index 0c2ae6b..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.sse.model.structuredbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.generic.core/build.properties b/plugins/org.eclipse.jst.server.generic.core/build.properties
deleted file mode 100644
index 84146a6..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.genericserver.jar = src/
-output.genericserver.jar = bin/
-bin.includes = plugin.xml,\
- genericserver.jar,\
- servers/,\
- plugin.properties
-src.includes = servers/,\
- src/,\
- plugin.xml,\
- plugin.properties
diff --git a/plugins/org.eclipse.jst.server.generic.core/plugin.properties b/plugins/org.eclipse.jst.server.generic.core/plugin.properties
deleted file mode 100644
index f867959..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-pluginName= Generic J2EE Server Plugin
-providerName=Eteration.com
-
-errorName=Invalid name.
-errorLocation=Invalid location.
-errorJRE=Invalid JRE.
-errorDuplicateRuntimeName=Name is already in use.
diff --git a/plugins/org.eclipse.jst.server.generic.core/plugin.xml b/plugins/org.eclipse.jst.server.generic.core/plugin.xml
deleted file mode 100644
index 7bdf594..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/plugin.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.server.generic.core"
- name="%pluginName"
- version="1.0.0"
- provider-name="%providerName"
- class="org.eclipse.jst.server.generic.core.CorePlugin">
-
- <runtime>
- <library name="genericserver.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.jst.server.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.ant.core"/>
- <import plugin="org.eclipse.ant.ui"/>
- <import plugin="org.eclipse.jst.server.generic.modules"/>
- </requires>
-
- <extension point="org.eclipse.wst.server.core.runtimeTargetHandlers">
- <runtimeTargetHandler
- id="org.eclipse.jst.server.generic.runtimeTarget"
- runtimeTypeIds="org.eclipse.jst.server.generic.runtime"
- class="org.eclipse.jst.server.generic.internal.core.GenericServerRuntimeTargetHandler"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.moduleKinds">
- <moduleKind
- id="j2ee.web"
- name="war file"/>
- <moduleKind
- id="j2ee.ejb"
- name="ejb"/>
- <moduleKind
- id="j2ee.ear"
- name="ear"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.runtimeTypes">
- <runtimeType
- id="org.eclipse.jst.server.generic.runtime"
- name="J2EE Generic Server Runtime"
- description="This is the Lomboz type runtime support"
- vendor="All"
- version="0"
- order="100"
- class="org.eclipse.jst.server.generic.internal.core.GenericServerRuntime"
- workingCopyClass="org.eclipse.jst.server.generic.internal.core.GenericServerRuntimeWorkingCopy">
- <moduleType
- types="j2ee.web"
- versions="1.2, 1.3, 1.4"/>
- </runtimeType>
- </extension>
-
-<extension point="org.eclipse.wst.server.core.serverTypes">
- <serverType
- runtime="true"
- class="org.eclipse.jst.server.generic.internal.core.GenericServer"
- order="100"
- hosts="localhost"
- id="org.eclipse.jst.server.generic"
- initialState="stopped"
- workingCopyClass="org.eclipse.jst.server.generic.internal.core.GenericServerWorkingCopy"
- runtimeTypeId="org.eclipse.jst.server.generic.runtime"
- description="Lomboz like generic server"
- launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
- monitorable="true"
- name="J2EE Generic server support"
- launchModes="run,debug"
- configurationTypeId="org.eclipse.jst.server.generic.configuration"
- >
-
- </serverType>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.serverConfigurationTypes">
- <serverConfigurationType
- id="org.eclipse.jst.server.generic.configuration"
- name="J2EE Generic server configuration"
- description="Lomboz like server configuration"
- isFolder="true"
- class="org.eclipse.jst.server.generic.internal.core.GenericServerConfigurationDelegate"
- workingCopyClass="org.eclipse.jst.server.generic.internal.core.GenericServerConfigurationWorkingCopy">
- </serverConfigurationType>
- </extension>
-
- <extension point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- id="org.eclipse.jst.server.generic.core.launchConfigurationType"
- name="Generic server launch configuration type"
- delegate="org.eclipse.jst.server.generic.internal.core.GenericServerLaunchConfigurationDelegate"
- modes="run, debug"
- sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
- </extension>
-
- <extension point="org.eclipse.debug.core.sourcePathComputers">
- <sourcePathComputer
- id="org.eclipse.jst.server.generic.core.sourcePathComputer"
- class="org.eclipse.jst.server.generic.internal.core.GenericServerSourcePathComputerDelegate"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.launchableAdapters">
- <launchableAdapter
- class="org.eclipse.jst.server.generic.internal.core.GenericServerLaunchableAdapterDelegate"
- id="org.eclipse.jst.server.generic.web"/>
- </extension>
-
-
-
-
-
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/jboss323.server b/plugins/org.eclipse.jst.server.generic.core/servers/jboss323.server
deleted file mode 100644
index be6ffb7..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/jboss323.server
+++ /dev/null
@@ -1,117 +0,0 @@
-
-<serverDefinition
- name="JBOSS 3.2.3"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- default="/your_server_root/appservers/jboss-3.2.3" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="port"
- label="Port:"
- type="string"
- default="8080" />
-<property id="serverConfig"
- label="Server Configuration (minimal/default/all):"
- type="string"
- default="default" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="JBOSS32X" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/appservers/jboss-3.2.3" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${serverRootDirectory}/server/${serverConfig}/deploy</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${serverRootDirectory}/server/${serverConfig}/deploy</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${serverRootDirectory}/server/${serverConfig}/deploy</earModulesDeployDirectory>
-<jndiInitialContextFactory>org.jnp.interfaces.NamingContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>jnp://${serverAddress}:1099</jndiProviderUrl>
-<startClass>org.jboss.Main</startClass>
-<startWorkingDirectory>${serverRootDirectory}/bin</startWorkingDirectory>
-<startVmParameters></startVmParameters>
-<startProgramArguments>-c ${serverConfig}</startProgramArguments>
-<stopClass>org.jboss.Shutdown</stopClass>
-<stopWorkingDirectory>${serverRootDirectory}/bin</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments>-S</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">${classPath}/bin/run.jar</jar>
- <jar type="variable">${classPath}/bin/shutdown.jar</jar>
- <jar type="variable">${classPath}/client/jboss-j2ee.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/javax.servlet.jar</jar>
- <jar type="variable">${classPath}/lib/jboss-boot.jar</jar>
- <jar type="variable">${classPath}/lib/jboss-system.jar</jar>
- <jar type="variable">${classPath}/lib/concurrent.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jboss.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jnpserver.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jpl-pattern.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jpl-util.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jboss-transaction.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/bcel.jar</jar>
- <jar type="variable">${classPath}/lib/jdom.jar</jar>
- <jar type="variable">${classPath}/lib/xercesImpl.jar</jar>
- <jar type="variable">${classPath}/lib/xml-apis.jar</jar>
- <jar type="variable">${classPath}/lib/gnu-regexp.jar</jar>
- <jar type="variable">${classPath}/lib/getopt.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPath}/client/jboss-j2ee.jar</jar>
- <jar type="variable">${classPath}/client/jnp-client.jar</jar>
- <jar type="variable">${classPath}/client/jboss-client.jar</jar>
- <jar type="variable">${classPath}/client/jboss-common-client.jar</jar>
- <jar type="variable">${classPath}/client/jbosssx-client.jar</jar>
- <jar type="variable">${classPath}/client/log4j.jar</jar>
- <jar type="variable">${classPath}/client/jnet.jar</jar>
- <jar type="variable">${classPath}/server/default/lib/jnpserver.jar</jar>
- <jar type="variable">${classPath}/client/jboss-jaas.jar</jar>
-</clientClassPath>
-<projectClassPath>
- <jar type="variable">${classPath}/bin/run.jar</jar>
- <jar type="variable">${classPath}/bin/shutdown.jar</jar>
- <jar type="variable">${classPath}/client/jboss-j2ee.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/javax.servlet.jar</jar>
- <jar type="variable">${classPath}/lib/jboss-boot.jar</jar>
- <jar type="variable">${classPath}/lib/jboss-system.jar</jar>
- <jar type="variable">${classPath}/lib/concurrent.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jboss.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jnpserver.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jpl-pattern.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jpl-util.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/jboss-transaction.jar</jar>
- <jar type="variable">${classPath}/server/${serverConfig}/lib/bcel.jar</jar>
-</projectClassPath>
-<adminTool>
- <web>
- <deploy>
- <![CDATA[
-
- <project name="deployextension" default="deploy" basedir=".">
- <target name="deploy">
- <jar destfile="${deploymentUnitName}.war">
- <zipfileset dir="${moduleDir}">
- <include name="**/*.*"/>
- <exclude name="**/*.war"/>
- </zipfileset>
- </jar>
- <move file="${deploymentUnitName}.war" todir="${deployDir}"/>
- </target>
- </project>
-
- ]]>
-
- </deploy>
- <undeploy>
- </undeploy>
- </web>
-</adminTool>
-<adminToolPath>
-</adminToolPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/jonas.server b/plugins/org.eclipse.jst.server.generic.core/servers/jonas.server
deleted file mode 100644
index 7fed5f8..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/jonas.server
+++ /dev/null
@@ -1,92 +0,0 @@
-
-<serverDefinition
- name="JonAS 4.1.4"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="jonasRoot"
- label="JonAS Installation Directory:"
- type="directory"
- default="/your_server_root/JOnAS-4.1.4" />
-<property id="jonasBase"
- label="JonAS Configuration Directory:"
- type="directory"
- default="/your_server_root/JOnAS-4.1.4" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- default="127.0.0.1" />
-<property id="port"
- label="Port:"
- type="string"
- default="9000" />
-<property id="protocols"
- label="Ejb Protocols:"
- type="string"
- default="jrmp" />
-<property id="mappernames"
- label="Mapper names:"
- type="string"
- default="" />
-<property id="classPathVariableName"
- label="Classpath Variable Name:"
- type="string"
- default="JONAS" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- default="/your_server_root/JOnAS-4.1.4" />
-<serverHome>${jonasRoot}</serverHome>
-<webModulesDeployDirectory>${jonasBase}/webapps/autoload</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${jonasBase}/ejbjars/autoload</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${jonasBase}/apps/autoload</earModulesDeployDirectory>
-<jndiInitialContextFactory>org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>iiop://${serverAddress}:2001</jndiProviderUrl>
-<startClass>org.objectweb.jonas.server.Bootstrap</startClass>
-<startWorkingDirectory>${jonasRoot}</startWorkingDirectory>
-<startVmParameters>-Dinstall.root=${jonasRoot} -Djonas.base=${jonasBase} -Djava.security.policy=${jonasRoot}/conf/java.policy -Djonas.classpath= -Djonas.default.classloader=true -Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate -Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory -Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config -Djava.endorsed.dirs=${jonasRoot}/lib/endorsed -Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi</startVmParameters>
-<startProgramArguments>org.objectweb.jonas.server.Server</startProgramArguments>
-<stopClass>org.objectweb.jonas.server.Bootstrap</stopClass>
-<stopWorkingDirectory>${jonasRoot}</stopWorkingDirectory>
-<stopVmParameters>-Dinstall.root=${jonasRoot} -Djonas.base=${jonasBase} -Djava.security.policy=${jonasRoot}/conf/java.policy -Djonas.classpath= -Djonas.default.classloader=true -Djavax.rmi.CORBA.PortableRemoteObjectClass=org.objectweb.carol.rmi.multi.MultiPRODelegate -Djava.naming.factory.initial=org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory -Djava.security.auth.login.config=${jonasRoot}/conf/jaas.config -Djava.endorsed.dirs=${jonasRoot}/lib/endorsed -Djava.rmi.server.RMIClassLoaderSpi=org.objectweb.jonas.server.RemoteClassLoaderSpi</stopVmParameters>
-<stopProgramArguments>org.objectweb.jonas.adm.JonasAdmin -s</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">${classPath}/lib/common/ow_jonas_bootstrap.jar</jar>
- <jar type="variable">${classPath}/conf</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPath}/lib/client.jar</jar>
-</clientClassPath>
-<projectClassPath>
- <jar type="variable">${classPath}/lib/common/ow_jonas_bootstrap.jar</jar>
- <jar type="variable">${classPath}/lib/common/j2ee/ejb/ejb-2_1-api.jar</jar>
-</projectClassPath>
-<adminTool>
- <web>
- <deploy>
- <![CDATA[
-
- <project name="deployextension" default="deploy" basedir=".">
- <target name="deploy">
- <jar destfile="${deploymentUnitName}.war">
- <zipfileset dir="${moduleDir}">
- <include name="**/*.*"/>
- <exclude name="**/*.war"/>
- </zipfileset>
- </jar>
- <move file="${deploymentUnitName}.war" todir="${deployDir}"/>
- </target>
- </project>
-
- ]]>
-
- </deploy>
- <undeploy>
- </undeploy>
- </web>
-</adminTool>
-<adminToolPath>
- <jar type="absolute">${jonasBase}/conf</jar>
- <jar type="absolute">${classPath}/lib/common/ow_jonas_bootstrap.jar</jar>
-</adminToolPath>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic81.server b/plugins/org.eclipse.jst.server.generic.core/servers/weblogic81.server
deleted file mode 100644
index 6ba0d8e..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/servers/weblogic81.server
+++ /dev/null
@@ -1,116 +0,0 @@
-
-<serverDefinition
- name="BEA Weblogic Server v8.1"
- ejbModules="true"
- webModules="true"
- earModules="true">
-<property id="beaHome"
- label="BEA Home Directory:"
- type="directory"
- context="runtime"
- default="C:/bea" />
-<property id="serverRootDirectory"
- label="Application Server Directory:"
- type="directory"
- context="runtime"
- default="C:/bea/weblogic81" />
-<property id="domainName"
- label="Admin Domain Name:"
- type="string"
- context="server"
- default="mydomain" />
-<property id="domainDirectory"
- label="Administration Domain Directory:"
- type="directory"
- context="server"
- default="C:/bea/user_projects/domains/mydomain" />
-<property id="serverName"
- label="Server Name:"
- type="string"
- context="server"
- default="myserver" />
-<property id="userName"
- label="User Name:"
- type="string"
- context="server"
- default="system" />
-<property id="password"
- label="Password:"
- type="string"
- context="server"
- default="weblogic" />
-<property id="productionMode"
- label="Production Mode:"
- type="boolean"
- context="server"
- default="false" />
-<property id="serverAddress"
- label="Address:"
- type="string"
- context="server"
- default="127.0.0.1" />
-<property id="port"
- label="Port:"
- type="string"
- context="server"
- default="7001" />
-<property id="classPath"
- label="Classpath Variable:"
- type="directory"
- context="runtime"
- default="C:/bea/weblogic81/server/lib" />
-<serverHome>${serverRootDirectory}</serverHome>
-<webModulesDeployDirectory>${domainDirectory}/applications</webModulesDeployDirectory>
-<ejbModulesDeployDirectory>${domainDirectory}/applications</ejbModulesDeployDirectory>
-<earModulesDeployDirectory>${domainDirectory}/applications</earModulesDeployDirectory>
-<jndiInitialContextFactory>weblogic.jndi.WLInitialContextFactory</jndiInitialContextFactory>
-<jndiProviderUrl>t3:/${serverAddress}:${port}</jndiProviderUrl>
-<startClass>weblogic.Server</startClass>
-<startWorkingDirectory>${domainDirectory}</startWorkingDirectory>
-<startVmParameters>-Xms32m -Xmx200m -XX:MaxPermSize=128m -Dweblogic.Name=${serverName} -Dbea.home="${beaHome}" -Dweblogic.management.username=${userName} -Dweblogic.management.password=${password} -Dweblogic.ProductionModeEnabled=${productionMode} -Djava.security.policy=="${serverRootDirectory}/server/lib/weblogic.policy"</startVmParameters>
-<startProgramArguments></startProgramArguments>
-<stopClass>weblogic.Admin</stopClass>
-<stopWorkingDirectory>${domainDirectory}</stopWorkingDirectory>
-<stopVmParameters></stopVmParameters>
-<stopProgramArguments>-url t3://${serverAddress}:${port} -username ${userName} -password ${password} SHUTDOWN</stopProgramArguments>
-<serverClassPath>
- <jar type="variable">${classPath}/weblogic.jar</jar>
- <jar type="variable">${classPath}/ojdbc14.jar</jar>
- <jar type="variable">${classPath}/webservices.jar</jar>
-</serverClassPath>
-<clientClassPath>
- <jar type="variable">${classPath}/wlclient.jar</jar>
- <jar type="variable">${classPath}/wsclient81.jar</jar>
- <jar type="variable">${classPath}/wljtaclient.jar</jar>
- <jar type="variable">${classPath}/wljmsclient.jar</jar>
-</clientClassPath>
-<projectClassPath>
- <jar type="variable">${classPath}/weblogic.jar</jar>
- <jar type="variable">${classPath}/ojdbc14.jar</jar>
- <jar type="variable">${classPath}/webservices.jar</jar>
-</projectClassPath>
-<adminTool>
- <web>
- <deploy>
- <![CDATA[
-
- <project name="deployextension" default="deploy" basedir=".">
- <target name="deploy">
- <jar destfile="${deploymentUnitName}.war">
- <zipfileset dir="${moduleDir}">
- <include name="**/*.*"/>
- <exclude name="**/jsp_servlet/*.class"/>
- <exclude name="**/*.war"/>
- </zipfileset>
- </jar>
- <move file="${deploymentUnitName}.war" todir="${deployDir}"/>
- </target>
- </project>
-
- ]]>
- </deploy>
- <undeploy>
- </undeploy>
- </web>
-</adminTool>
-</serverDefinition>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/CorePlugin.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/CorePlugin.java
deleted file mode 100644
index aeda021..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/CorePlugin.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.core;
-
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.server.generic.internal.core.ServerTypeDefinitionManager;
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.io.IOException;
-import java.net.URL;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- *
- * @author Gorkem Ercan
- */
-public class CorePlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.server.generic.core";
-
- //The shared instance.
- private static CorePlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- private ServerTypeDefinitionManager fServerTypeDefinitionManager;
- /**
- * The constructor.
- */
- public CorePlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.server.generic.core.CorePluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static CorePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = CorePlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
- /**
- *
- * @return
- */
- public ServerTypeDefinitionManager getServerTypeDefinitionManager()
- {
- if(fServerTypeDefinitionManager==null)
- fServerTypeDefinitionManager = new ServerTypeDefinitionManager(getInstallUrl());
- return fServerTypeDefinitionManager;
- }
-
- private URL getInstallUrl()
- {
- try {
- return Platform.resolve(this.getBundle().getEntry("/"));
- } catch (IOException e) {
- return null;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
deleted file mode 100644
index 345f459..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.generic.core.CorePlugin;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.jst.server.generic.modules.WebModule;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IPublisher;
-import org.eclipse.wst.server.core.resources.IModuleFolder;
-import org.eclipse.wst.server.core.resources.IModuleResource;
-import org.eclipse.wst.server.core.resources.IRemoteResource;
-/**
- * Ant based publisher.
- *
- * @author Gorkem Ercan
- */
-
-public class AntPublisher implements IPublisher {
-
- /**
- * @param parents
- * @param module
- * @param serverDefinition
- */
- private List parents;
- private IModule module;
- private ServerTypeDefinition serverTypeDefinition;
-
- public AntPublisher(List parents, IModule module, ServerTypeDefinition serverDefinition) {
- this.parents = parents;
- this.module = module;
- this.serverTypeDefinition = serverDefinition;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wtp.server.core.model.IPublisher#getMappedLocation(org.eclipse.wtp.server.core.resources.IModuleResource)
- */
- public IPath getMappedLocation(IModuleResource resource) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wtp.server.core.model.IPublisher#shouldMapMembers(org.eclipse.wtp.server.core.resources.IModuleFolder)
- */
- public boolean shouldMapMembers(IModuleFolder folder) {
- // TODO Auto-generated method stub
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wtp.server.core.model.IPublisher#getRemoteResources(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IRemoteResource[] getRemoteResources(IProgressMonitor monitor)
- throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wtp.server.core.model.IPublisher#delete(org.eclipse.wtp.server.core.resources.IRemoteResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus[] delete(IRemoteResource[] resource, IProgressMonitor monitor)
- throws CoreException {
-
- return new IStatus[]{new Status(IStatus.OK,CorePlugin.PLUGIN_ID,0,"DeleteResource",null)};
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wtp.server.core.model.IPublisher#publish(org.eclipse.wtp.server.core.resources.IModuleResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus[] publish(IModuleResource[] resource,
- IProgressMonitor monitor) throws CoreException {
- String deployAnt = serverTypeDefinition.getAdminTool().getWeb().getDeploy();
- if(deployAnt == null || deployAnt.length()<1)
- return new IStatus[]{new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0,"AntBuildFileDoesNotExist",null)};
-
-
- IPath file = CorePlugin.getDefault().getStateLocation().append("tempAnt.xml");
- try {
- createNewFile(file.toFile(),deployAnt.getBytes());
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- runAnt(file.toString(),new String[]{"deploy"},getPublishProperties(resource),monitor);
-
- file.toFile().delete();
-
- // TODO Auto-generated method stub
- return null;
- }
- private Map getPublishProperties(IModuleResource[] resource)
- {
- Map props = new HashMap();
- props.put("deploymentUnitName",this.module.getName());
- props.put("moduleDir",((WebModule)this.module).getLocation().toString());
- props.put("deployDir",serverTypeDefinition.getWebModulesDeployDirectory());
- return props;
-
-
- }
- private void runAnt(String buildFile,String[] targets,Map properties ,IProgressMonitor monitor)throws CoreException
- {
- AntRunner runner = new AntRunner();
- runner.setBuildFileLocation(buildFile);
- runner.setExecutionTargets(targets);
- runner.addUserProperties(properties);
- runner.run(monitor);
- }
-
-
-
-
- public boolean createNewFile(File f,byte[] content) throws IOException {
- if (f != null) {
- if (f.exists()) {
- return false;
- }
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(f);
- fos.write(content);
- } finally {
- if (fos != null) {
- fos.close();
- }
- }
- return true;
- }
- return false;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wtp.server.core.model.IPublisher#deleteAll(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus deleteAll(IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
deleted file mode 100644
index b98c591..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServer.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.generic.core.CorePlugin;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.jst.server.generic.modules.J2eeSpecModuleFactoryDelegate;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.core.IServerState;
-import org.eclipse.wst.server.core.ITask;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleEvent;
-import org.eclipse.wst.server.core.model.IModuleFactoryEvent;
-import org.eclipse.wst.server.core.model.IMonitorableServer;
-import org.eclipse.wst.server.core.model.IPublisher;
-import org.eclipse.wst.server.core.model.IServerDelegate;
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.model.IStartableServer;
-import org.eclipse.wst.server.core.model.IURLProvider;
-import org.eclipse.wst.server.core.resources.IModuleResourceDelta;
-import org.eclipse.wst.server.core.util.ServerPort;
-import org.eclipse.wst.server.core.util.SocketUtil;
-
-/**
- * Generic XML based server implementation.
- *
- * @author Gorkem Ercan
- */
-public class GenericServer implements IServerDelegate, IStartableServer, IMonitorableServer,IURLProvider {
- private IServerState fLiveServer;
- private static final String ATTR_STOP = "stop-server";
-
- // the thread used to ping the server to check for startup
- protected transient PingThread ping = null;
- protected transient IProcess process;
- protected transient IDebugEventSetListener processListener;
-
- private ServerTypeDefinition fServerDefinition;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#initialize(org.eclipse.wst.server.core.IServerState)
- */
- public void initialize(IServerState liveServer) {
- this.fLiveServer = liveServer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#dispose()
- */
- public void dispose() {
- this.fLiveServer = null;
-
- }
-
- /**
- * Returns the project publisher that can be used to
- * publish the given project.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return org.eclipse.wst.server.core.model.IProjectPublisher
- */
- public IPublisher getPublisher(List parents, IModule module) {
- return new AntPublisher(parents, module, this.getServerDefinition());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#updateConfiguration()
- */
- public void updateConfiguration() {
- Trace.trace(Trace.FINEST, "updateConfiguration" + this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#updateModule(org.eclipse.wst.server.core.model.IModule,
- * org.eclipse.wst.server.core.resources.IModuleResourceDelta)
- */
- public void updateModule(IModule module, IModuleResourceDelta delta) {
- // TODO Auto-generated method stub
- Trace.trace(Trace.FINEST, "Configuration updated " + this);
- //setConfigurationSyncState(SYNC_STATE_DIRTY);
- //setRestartNeeded(true);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#publishStart(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus publishStart(IProgressMonitor monitor) {
- return new Status(IStatus.OK, CorePlugin.PLUGIN_ID, 0, "PublishingStarted", null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#publishConfiguration(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus publishConfiguration(IProgressMonitor monitor) {
-
- return new Status(IStatus.OK, CorePlugin.PLUGIN_ID, 0, "Published Configuration", null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#publishStop(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus publishStop(IProgressMonitor monitor) {
- fLiveServer.setConfigurationSyncState(IServer.SYNC_STATE_IN_SYNC);
- return new Status(IStatus.OK, CorePlugin.PLUGIN_ID, 0, "Published Configuration", null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#canModifyModules(org.eclipse.wst.server.core.model.IModule[],
- * org.eclipse.wst.server.core.model.IModule[])
- */
- public IStatus canModifyModules(IModule[] add, IModule[] remove) {
- // TODO Auto-generated method stub
- return new Status(IStatus.OK, CorePlugin.PLUGIN_ID, 0, "CanModifyModules", null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#getModules()
- */
- public IModule[] getModules() {
- // TODO Auto-generated method stub
- List list = J2eeSpecModuleFactoryDelegate.getInstance().getModules();
- return (IModule[])list.toArray(new IModule[list.size()]);
- }
-
-
- protected IWebModule getWebModule(IProject project) throws CoreException {
-
- return null;
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#getModuleState(org.eclipse.wst.server.core.model.IModule)
- */
- public byte getModuleState(IModule module) {
- // TODO Auto-generated method stub
- return IServer.MODULE_STATE_STARTED;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#getRepairCommands(org.eclipse.wst.server.core.model.IModuleFactoryEvent[],
- * org.eclipse.wst.server.core.model.IModuleEvent[])
- */
- public ITask[] getRepairCommands(IModuleFactoryEvent[] factoryEvent,
- IModuleEvent[] moduleEvent) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#getChildModules(org.eclipse.wst.server.core.model.IModule)
- */
- public List getChildModules(IModule module) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#getParentModules(org.eclipse.wst.server.core.model.IModule)
- */
- public List getParentModules(IModule module) throws CoreException {
- //FIXME This is valid for only web modules. A generic server should support any
- // kind of j2ee module. Fix this after the server architectures are determined.
- if (module instanceof IWebModule) {
- IWebModule webModule = (IWebModule) module;
- IStatus status = canModifyModules(new IModule[] { module }, null);
- if (status == null || !status.isOK())
- throw new CoreException(status);
- ArrayList l = new ArrayList();
- l.add(webModule);
- return l;
- }
- return null;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#setLaunchDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
- */
- public void setLaunchDefaults(ILaunchConfigurationWorkingCopy workingCopy) {
- fLiveServer.getRuntime().getDelegate();
- workingCopy.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
- getStartClassName());
-
- GenericServerRuntime runtime = (GenericServerRuntime) fLiveServer
- .getRuntime().getDelegate();
-
- IVMInstall vmInstall = runtime.getVMInstall();
- workingCopy.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, runtime
- .getVMInstallTypeId());
- workingCopy.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME,
- vmInstall.getName());
-
- setupLaunchClasspath(workingCopy, vmInstall);
-
-
- workingCopy.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
- getWorkingDirectory());
- workingCopy.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
- getProgramArguments());
- workingCopy.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
- getVmArguments());
-
- //workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP,);
-
- }
-
- private List getClasspathMementos() {
- return getServerDefinition().getServerClasspathMementos();
- }
-
- private String getVmArguments() {
- return getServerDefinition().getStartVmParameters();
- }
-
- private String getProgramArguments() {
- return getServerDefinition().getStartProgramArguments();
- }
-
- private String getWorkingDirectory() {
- return getServerDefinition().getStartWorkingDirectory();
- }
-
- public String getStartClassName() {
- return getServerDefinition().getStartClass();
- }
-
- /**
- * @return
- */
- private Map getServerInstanceProperties() {
- Map instanceProperties = fLiveServer.getRuntime().getAttribute(
- GenericServerRuntime.SERVER_INSTANCE_PROPERTIES, (Map) null);
- return instanceProperties;
- }
-
- public ServerTypeDefinition getServerDefinition() {
-
- if (fServerDefinition == null)
- fServerDefinition = CorePlugin.getDefault()
- .getServerTypeDefinitionManager()
- .getServerRuntimeDefinition(
- fLiveServer.getRuntime().getAttribute(
- GenericServerRuntime.SERVER_DEFINITION_ID,
- ""), getServerInstanceProperties());
- return fServerDefinition;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IMonitorableServer#getServerPorts()
- */
- public List getServerPorts() {
- List ports = new ArrayList();
-
-
- try {
- int port = Integer.parseInt(this.getServerDefinition().getPort());
- ports.add(new ServerPort("server", "Server port", port, "TCPIP"));
- } catch (Exception e) {
- }
-
- return ports;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IStartableServer#isTerminateOnShutdown()
- */
- public boolean isTerminateOnShutdown() {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * Setup for starting the server.
- *
- * @param launch ILaunch
- * @param launchMode String
- * @param monitor IProgressMonitor
- */
- public void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException {
- if ("true".equals(launch.getLaunchConfiguration().getAttribute(ATTR_STOP, "false")))
- return;
-// IStatus status = getRuntime().validate();
-// if (status != null && !status.isOK())
-// throw new CoreException(status);
-
-
- Iterator iterator = this.getServerPorts().iterator();
- IServerPort sp = null;
- while (iterator.hasNext()) {
- sp = (IServerPort) iterator.next();
- if (SocketUtil.isPortInUse(sp.getPort(), 5))
- throw new CoreException(new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, "Server Part In Use "+sp.getPort() + "- " +sp.getName() ,null));
- }
-
- fLiveServer.setServerState(IServer.SERVER_STARTING);
-
- // ping server to check for startup
- try {
- String url = "http://localhost";
- int port = sp.getPort();
- if (port != 80)
- url += ":" + port;
- ping = new PingThread(this, fLiveServer, url, launchMode);
- ping.start();
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Can't ping for server startup.");
- }
- }
-
- /**
- * Cleanly shuts down and terminates the server.
- */
- public void stop() {
- byte state = this.fLiveServer.getServerState();
- if (state == IServer.SERVER_STOPPED)
- return;
- else if (state == IServer.SERVER_STARTING || state == IServer.SERVER_STOPPING) {
- terminate();
- return;
- }
-
- try {
- Trace.trace(Trace.FINEST, "Stopping Server");
- if (state != IServer.SERVER_STOPPED)
- fLiveServer.setServerState(IServer.SERVER_STOPPING);
- ILaunchManager mgr = DebugPlugin.getDefault().getLaunchManager();
-
- ILaunchConfigurationType type =
- mgr.getLaunchConfigurationType(
- IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-
- String launchName = "GenericServerStopper";
- String uniqueLaunchName =
- mgr.generateUniqueLaunchConfigurationNameFrom(launchName);
- ILaunchConfiguration conf = null;
-
- ILaunchConfiguration[] lch = mgr.getLaunchConfigurations(type);
- for (int i = 0; i < lch.length; i++) {
- if (launchName.equals(lch[i].getName())) {
- conf = lch[i];
- break;
- }
- }
-
- ILaunchConfigurationWorkingCopy wc = null;
- if (conf != null) {
- wc = conf.getWorkingCopy();
- } else {
- wc = type.newInstance(null, uniqueLaunchName);
- }
- //To stop from appearing in history lists
- wc.setAttribute(IDebugUIConstants.ATTR_PRIVATE, true);
-
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
- this.getServerDefinition().getStopClass());
-
- GenericServerRuntime runtime = (GenericServerRuntime) fLiveServer
- .getRuntime().getDelegate();
-
- IVMInstall vmInstall = runtime.getVMInstall();
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, runtime
- .getVMInstallTypeId());
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME,
- vmInstall.getName());
-
- setupLaunchClasspath(wc, vmInstall);
-
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
- getWorkingDirectory());
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
- getServerDefinition().getStopProgramArguments());
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
- getServerDefinition().getStopVmParameters());
- wc.setAttribute(ATTR_STOP, "true");
- wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error stopping Server", e);
- }
- }
-
-
- /**
- * @param wc
- * @param vmInstall
- */
- private void setupLaunchClasspath(ILaunchConfigurationWorkingCopy wc, IVMInstall vmInstall) {
- List cp = getClasspathMementos();
-
- // add tools.jar to the path
- if (vmInstall != null) {
- try {
- cp
- .add(JavaRuntime
- .newRuntimeContainerClasspathEntry(
- new Path(JavaRuntime.JRE_CONTAINER)
- .append(
- "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType")
- .append(vmInstall.getName()),
- IRuntimeClasspathEntry.BOOTSTRAP_CLASSES)
- .getMemento());
- } catch (Exception e) {
- }
-
- IPath jrePath = new Path(vmInstall.getInstallLocation()
- .getAbsolutePath());
- if (jrePath != null) {
- IPath toolsPath = jrePath.append("lib").append("tools.jar");
- if (toolsPath.toFile().exists()) {
- try {
- cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(
- toolsPath).getMemento());
- } catch (CoreException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- }
- }
- }
-
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, cp);
- wc.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH,
- false);
- }
-
- /**
- * Terminates the server.
- */
- public void terminate() {
- if (fLiveServer.getServerState() == IServer.SERVER_STOPPED)
- return;
-
- try {
- fLiveServer.setServerState(IServer.SERVER_STOPPING);
- Trace.trace(Trace.FINEST, "Killing the Server process");
- if (process != null && !process.isTerminated()) {
- process.terminate();
- stopImpl();
- }
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error killing the process", e);
- }
- }
-
- protected void stopImpl() {
- if (ping != null) {
- ping.stopPinging();
- ping = null;
- }
- if (process != null) {
- process = null;
- DebugPlugin.getDefault().removeDebugEventListener(processListener);
- processListener = null;
- }
- fLiveServer.setServerState(IServer.SERVER_STOPPED);
- }
- public void setProcess(final IProcess newProcess) {
- if (process != null)
- return;
-
- process = newProcess;
- processListener = new IDebugEventSetListener() {
- public void handleDebugEvents(DebugEvent[] events) {
- if (events != null) {
- int size = events.length;
- for (int i = 0; i < size; i++) {
- if (process.equals(events[i].getSource()) && events[i].getKind() == DebugEvent.TERMINATE) {
- DebugPlugin.getDefault().removeDebugEventListener(this);
- stopImpl();
- }
- }
- }
- }
- };
- DebugPlugin.getDefault().addDebugEventListener(processListener);
- }
-
- public int getStartTimeout() {
- return 300000;
- }
-
- public int getStopTimeout() {
- return 300000;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wtp.server.core.model.IURLProvider#getModuleRootURL(org.eclipse.wtp.server.core.model.IModule)
- */
- public URL getModuleRootURL(IModule module) {
-
- try {
- if (module == null || !(module instanceof IWebModule))
- return null;
-
- IServerConfiguration serverConfig = fLiveServer
- .getServerConfiguration();
- if (serverConfig == null)
- return null;
-
- String url = "http://localhost";
- int port = Integer.parseInt(getServerDefinition().getPort());
- port = ServerCore.getServerMonitorManager().getMonitoredPort(
- fLiveServer, port, "web");
- if (port != 80)
- url += ":" + port;
-
- url += "/"+module.getName();
-
- if (!url.endsWith("/"))
- url += "/";
-
- return new URL(url);
- } catch (Exception e) {
- Trace.trace("Could not get root URL", e);
- return null;
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationDelegate.java
deleted file mode 100644
index 6055b70..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationDelegate.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.server.core.util.ServerConfigurationDelegate;
-
-
-public class GenericServerConfigurationDelegate extends ServerConfigurationDelegate {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IServerConfigurationDelegate#save(org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void save(IPath path, IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IServerConfigurationDelegate#save(org.eclipse.core.resources.IFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void save(IFolder folder, IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
- }}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationWorkingCopy.java
deleted file mode 100644
index 8de5783..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerConfigurationWorkingCopy.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.generic.core.CorePlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.model.IServerConfigurationWorkingCopyDelegate;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-
-
-public class GenericServerConfigurationWorkingCopy implements
- IServerConfigurationWorkingCopyDelegate {
-
- IServerConfigurationWorkingCopy configurationWC;
- IServerConfiguration configuration;
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationWorkingCopyDelegate#initialize(com.ibm.wtp.server.core.IServerConfigurationWorkingCopy)
- */
- public void initialize(IServerConfigurationWorkingCopy configuration) {
- this.configurationWC = configuration;
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationWorkingCopyDelegate#setDefaults()
- */
- public void setDefaults() {
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationWorkingCopyDelegate#importFromPath(org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void importFromPath(IPath path, IProgressMonitor monitor)
- throws CoreException {
- // TODO Auto-generated method stub
- System.out.println("importFromPath - " + path);
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationWorkingCopyDelegate#importFromRuntime(com.ibm.wtp.server.core.IRuntime, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void importFromRuntime(IRuntime runtime, IProgressMonitor monitor)
- throws CoreException {
- // TODO Auto-generated method stub
- System.out.println("importFromRuntime - " + runtime);
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationDelegate#initialize(com.ibm.wtp.server.core.IServerConfiguration)
- */
- public void initialize(IServerConfiguration configuration) {
- this.configuration = configuration;
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationDelegate#dispose()
- */
- public void dispose() {
- // TODO Auto-generated method stub
- System.out.println("dispose - ");
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationDelegate#load(org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void load(IPath path, IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
- System.out.println("load - " + path);
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationDelegate#load(org.eclipse.core.resources.IFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void load(IFolder folder, IProgressMonitor monitor)
- throws CoreException {
- // TODO Auto-generated method stub
- System.out.println("load - " + folder);
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationDelegate#save(org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void save(IPath path, IProgressMonitor monitor) throws CoreException {
-
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- boolean forceDirty = false;
- // make sure directory exists
- if (!path.toFile().exists()) {
- forceDirty = true;
- path.toFile().mkdir();
- }
- monitor.worked(1);
-
- monitor.worked(1);
-
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Generic Server configuration to " + path.toString(), e);
- throw new CoreException(new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, "Could Not Save Configuration", e));
- }
- System.out.println("save - " + path);
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IServerConfigurationDelegate#save(org.eclipse.core.resources.IFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void save(IFolder folder, IProgressMonitor monitor)
- throws CoreException {
-
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
-
- // save server.xml
- byte[] data = "".getBytes();
- InputStream in = new ByteArrayInputStream(data);
- IFile file = folder.getFile("server.xml");
- if (file.exists()) {
- file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- } else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
-
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Generic Server configuration to " + folder.toString(), e);
- throw new CoreException(new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, "Could Not Save Configuration", e));
- }
- System.out.println("save - " + folder);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IServerConfigurationWorkingCopyDelegate#handleSave(byte, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void handleSave(byte id, IProgressMonitor monitor) {
- // TODO Auto-generated method stub
- System.out.println("handleSave - " + id);
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchConfigurationDelegate.java
deleted file mode 100644
index 123816f..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.io.File;
-import java.util.Map;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.jst.server.generic.core.CorePlugin;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-/**
- * ServerLaunchConfiguration for the generic server.
- *
- * @author Gorkem Ercan
- */
-public class GenericServerLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void launch(ILaunchConfiguration configuration, String mode,
- ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
- String serverId = configuration.getAttribute(IServer.ATTR_SERVER_ID, (String) null);
-
- IServer server = ServerCore.getResourceManager().getServer(serverId);
- if (server == null)
- {
- abort("Server "+serverId+" does not exist", null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
- }
-
- GenericServer genericServer = (GenericServer)server.getDelegate();
- genericServer.setupLaunch(launch, mode, monitor);
-
- String mainTypeName = genericServer.getStartClassName();
-
- IVMInstall vm = verifyVMInstall(configuration);
-
- IVMRunner runner = vm.getVMRunner(mode);
-
- File workingDir = verifyWorkingDirectory(configuration);
- String workingDirName = null;
- if (workingDir != null)
- workingDirName = workingDir.getAbsolutePath();
-
- // Program & VM args
- String pgmArgs = getProgramArguments(configuration);
- String vmArgs = getVMArguments(configuration);
-
- ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-
- // VM-specific attributes
- Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-
- // Classpath
- String[] classpath = getClasspath(configuration);
-
- // Create VM config
- VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath);
- runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
- runConfig.setVMArguments(execArgs.getVMArgumentsArray());
- runConfig.setWorkingDirectory(workingDirName);
- runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
- // Bootpath
- String[] bootpath = getBootpath(configuration);
- if (bootpath != null && bootpath.length > 0)
- runConfig.setBootClassPath(bootpath);
-
- setDefaultSourceLocator(launch, configuration);
-
- // Launch the configuration
- runner.run(runConfig, launch, monitor);
- genericServer.setProcess(launch.getProcesses()[0]);
-
- }
-
- /**
- * Throws a core exception with the given message and optional
- * exception. The exception's status code will indicate an error.
- *
- * @param message error message
- * @param exception cause of the error, or <code>null</code>
- * @exception CoreException with the given message and underlying
- * exception
- */
- protected void abort(String message, Throwable exception, int code) throws CoreException {
- throw new CoreException(new Status(IStatus.ERROR, CorePlugin.getDefault().getBundle().getSymbolicName(), code, message, exception));
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchableAdapterDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchableAdapterDelegate.java
deleted file mode 100644
index a374bcc..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerLaunchableAdapterDelegate.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.net.URL;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.*;
-import org.eclipse.wst.server.core.util.HttpLaunchable;
-import org.eclipse.wst.server.core.util.NullLaunchable;
-import org.eclipse.wst.server.core.util.NullModuleObject;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.jst.server.j2ee.Servlet;
-import org.eclipse.jst.server.j2ee.WebResource;
-/**
- * Web Launchable adapter delegate
- * @author Gorkem Ercan
- */
-public class GenericServerLaunchableAdapterDelegate implements ILaunchableAdapterDelegate {
- /*
- * @see ILaunchableAdapterDelegate#getLaunchable(IServer, IModuleObject)
- */
- public ILaunchable getLaunchable(IServer server, IModuleObject moduleObject) {
-
- IServerDelegate delegate = server.getDelegate();
- if (!(delegate instanceof GenericServer))
- return null;
- if (!(moduleObject instanceof Servlet) &&
- !(moduleObject instanceof WebResource) &&
- !(moduleObject instanceof NullModuleObject))
- return null;
- if (!(moduleObject.getModule() instanceof IWebModule))
- return null;
-
- try {
- URL url = ((IURLProvider) delegate).getModuleRootURL(moduleObject.getModule());
-
- Trace.trace("root: " + url);
-
- if (moduleObject instanceof Servlet) {
- Servlet servlet = (Servlet) moduleObject;
- if (servlet.getAlias() != null) {
- String path = servlet.getAlias();
- if (path.startsWith("/"))
- path = path.substring(1);
- url = new URL(url, path);
- } else
- url = new URL(url, "servlet/" + servlet.getServletClassName());
- } else if (moduleObject instanceof WebResource) {
- WebResource resource = (WebResource) moduleObject;
- String path = resource.getPath().toString();
- Trace.trace("path: " + path);
- if (path != null && path.startsWith("/") && path.length() > 0)
- path = path.substring(1);
- if (path != null && path.length() > 0)
- url = new URL(url, path);
- } else { // null
- return new NullLaunchable();
- }
- return new HttpLaunchable(url);
- } catch (Exception e) {
- Trace.trace("Error getting URL for " + moduleObject, e);
- return null;
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntime.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntime.java
deleted file mode 100644
index 693e033..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntime.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.core.IGenericRuntime;
-import org.eclipse.jst.server.generic.core.CorePlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- * Generic server runtime support.
- *
- * @author Gorkem Ercan
- */
-public class GenericServerRuntime implements IGenericRuntime
-{
-
- private IRuntime fRuntime;
- public static final String SERVER_DEFINITION_ID = "server_definition_id";
- public static final String SERVER_INSTANCE_PROPERTIES = "generic_server_instance_properties";
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.core.IGenericRuntime#getVMInstallTypeId()
- */
- public String getVMInstallTypeId() {
- return JavaRuntime.getDefaultVMInstall().getVMInstallType().getId();
- // TODO configurable.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.core.IGenericRuntime#getVMInstallId()
- */
- public String getVMInstallId() {
- return JavaRuntime.getDefaultVMInstall().getId();
- // TODO configurable.
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.core.IGenericRuntime#getVMInstall()
- */
- public IVMInstall getVMInstall() {
- return JavaRuntime.getDefaultVMInstall();
- // TODO configurable
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.core.IGenericRuntime#validate()
- */
- public IStatus validate() {
- if (fRuntime.getName() == null || fRuntime.getName().length() == 0)
- return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, CorePlugin.getResourceString("%errorName"), null);
-
- if (ServerUtil.isNameInUse(fRuntime))
- return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, CorePlugin.getResourceString("%errorDuplicateRuntimeName"), null);
-
-// IPath path = fRuntime.getLocation();
-// if (path == null || path.isEmpty())
-// return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, "", null);
-// else if (!path.toFile().exists())
-// return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, CorePlugin.getResourceString("%errorLocation"), null);
-// else
- if (getVMInstall() == null)
- return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, CorePlugin.getResourceString("%errorJRE"), null);
- return new Status(IStatus.OK, CorePlugin.PLUGIN_ID, 0, "", null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IRuntimeDelegate#initialize(org.eclipse.wst.server.core.IRuntime)
- */
- public void initialize(IRuntime runtime) {
- this.fRuntime = runtime;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IRuntimeDelegate#dispose()
- */
- public void dispose() {
- this.fRuntime=null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeTargetHandler.java
deleted file mode 100644
index b61857b..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeTargetHandler.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.core.ClasspathRuntimeTargetHandler;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.wst.server.core.IRuntime;
-/**
- * Provides the Classpath containers to be added into project classpaths.
- *
- * @author Gorkem Ercan
- */
-public class GenericServerRuntimeTargetHandler extends
- ClasspathRuntimeTargetHandler {
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.java.core.ClasspathRuntimeTargetHandler#getId()
- */
- public String getId() {
- return "org.eclipse.jst.server.generic.runtimeTarget";
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.java.core.ClasspathRuntimeTargetHandler#getClasspathContainerLabel(com.ibm.wtp.server.core.IRuntime, java.lang.String)
- */
- public String getClasspathContainerLabel(IRuntime runtime, String id) {
- ServerTypeDefinition definition= ServerTypeDefinitionUtil.getServerTypeDefinition(runtime);
- return definition.getName();
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.java.core.ClasspathRuntimeTargetHandler#resolveClasspathContainer(com.ibm.wtp.server.core.IRuntime, java.lang.String)
- */
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime,
- String id)
- {
- return ServerTypeDefinitionUtil.getServerClassPathEntry(runtime);
- }
-
- public String[] getClasspathEntryIds(IRuntime runtime) {
- // Values do not realy have any use but the number of entries give the number of
- // containers you have.
- return new String[1];
- }
-
- public IClasspathEntry[] getDelegateClasspathEntries(IRuntime runtime) {
- GenericServerRuntime genericRuntime = (GenericServerRuntime)runtime.getDelegate();
- IVMInstall vmInstall = genericRuntime.getVMInstall();
- if (vmInstall != null) {
- String name = vmInstall.getName();
- return new IClasspathEntry[] { JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER).append("org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType").append(name)) };
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeWorkingCopy.java
deleted file mode 100644
index 0b56df7..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerRuntimeWorkingCopy.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jst.server.core.IGenericRuntimeWorkingCopy;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-
-public class GenericServerRuntimeWorkingCopy implements
- IGenericRuntimeWorkingCopy {
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.java.core.IGenericRuntimeWorkingCopy#setVMInstall(java.lang.String, java.lang.String)
- */
- public void setVMInstall(String typeId, String id) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.java.core.IGenericRuntime#getVMInstallTypeId()
- */
- public String getVMInstallTypeId() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.java.core.IGenericRuntime#getVMInstallId()
- */
- public String getVMInstallId() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.java.core.IGenericRuntime#getVMInstall()
- */
- public IVMInstall getVMInstall() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IRuntimeDelegate#validate()
- */
- public IStatus validate() {
- // TODO Auto-generated method stub
- return Status.OK_STATUS;
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IRuntimeWorkingCopyDelegate#initialize(com.ibm.wtp.server.core.IRuntimeWorkingCopy)
- */
- public void initialize(IRuntimeWorkingCopy runtime) {
-
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IRuntimeWorkingCopyDelegate#setDefaults()
- */
- public void setDefaults() {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IRuntimeWorkingCopyDelegate#handleSave(byte, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void handleSave(byte id, IProgressMonitor monitor) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IRuntimeDelegate#initialize(com.ibm.wtp.server.core.IRuntime)
- */
- public void initialize(IRuntime runtime) {
-
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.core.model.IRuntimeDelegate#dispose()
- */
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerSourcePathComputerDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerSourcePathComputerDelegate.java
deleted file mode 100644
index feb058e..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerSourcePathComputerDelegate.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupUtil;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-/**
- * SourcePathComputer for the GenericLaunchConfiguration.
- *
- * @author Gorkem Ercan
- */
-public class GenericServerSourcePathComputerDelegate implements ISourcePathComputerDelegate {
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
- */
- public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-
- IRuntimeClasspathEntry[] unresolvedEntries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
- // FIXME have only the projects of registered modules.
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- List javaProjectList = new ArrayList();
- for(int i = 0; i<projects.length;i++)
- {
- if(projects[i].hasNature(JavaCore.NATURE_ID))
- {
- IJavaProject javaProject = (IJavaProject) projects[i].getNature(JavaCore.NATURE_ID);
- javaProjectList.add(javaProject);
- }
- }
- IRuntimeClasspathEntry[] projectEntries = new IRuntimeClasspathEntry[javaProjectList.size()];
- for (int i = 0; i < javaProjectList.size(); i++) {
- projectEntries[i] = JavaRuntime.newProjectRuntimeClasspathEntry((IJavaProject)javaProjectList.get(i));
- }
- IRuntimeClasspathEntry[] entries = new IRuntimeClasspathEntry[projectEntries.length+unresolvedEntries.length];
- System.arraycopy(unresolvedEntries,0,entries,0,unresolvedEntries.length);
- System.arraycopy(projectEntries,0,entries,unresolvedEntries.length,projectEntries.length);
-
- IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
- return JavaSourceLookupUtil.translate(resolved, true);
- }}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerWorkingCopy.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerWorkingCopy.java
deleted file mode 100644
index 99abdda..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerWorkingCopy.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S. All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Common Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ETERATIOn A.S.
- * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many individuals on
- * behalf of the Eteration Bilisim A.S. For more information on eteration,
- * please see <http://www.eteration.com/>.
- ******************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.IServerState;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ITask;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleEvent;
-import org.eclipse.wst.server.core.model.IModuleFactoryEvent;
-import org.eclipse.wst.server.core.model.IPublisher;
-import org.eclipse.wst.server.core.model.IServerWorkingCopyDelegate;
-import org.eclipse.wst.server.core.resources.IModuleResourceDelta;
-
-public class GenericServerWorkingCopy extends GenericServer implements
- IServerWorkingCopyDelegate {
-
- protected IServerWorkingCopy workingCopy;
-
- private IServerState liveServer;
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerWorkingCopyDelegate#initialize(com.ibm.wtp.server.core.IServerWorkingCopy)
- */
- public void initialize(IServerWorkingCopy workingCopy) {
- this.workingCopy = workingCopy;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerWorkingCopyDelegate#setDefaults()
- */
- public void setDefaults() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerWorkingCopyDelegate#modifyModules(com.ibm.wtp.server.core.model.IModule[],
- * com.ibm.wtp.server.core.model.IModule[],
- * org.eclipse.core.runtime.IProgressMonitor)
- */
- public void modifyModules(IModule[] add, IModule[] remove,
- IProgressMonitor monitor) throws CoreException {
-
- IServerConfigurationWorkingCopy scwc = liveServer
- .getServerConfiguration().getWorkingCopy();
-
- Object wc = scwc.getWorkingCopyDelegate();
- boolean change = false;
-
- if (add != null) {
- int size = add.length;
- for (int i = 0; i < size; i++) {
- IModule module3 = add[i];
- change = true;
- }
- }
-
- if (remove != null) {
- int size2 = remove.length;
- for (int j = 0; j < size2; j++) {
- IModule module3 = remove[j];
- String memento = module3.getFactoryId() + ":" + module3.getId();
- }
- }
- if (!change)
- scwc.release();
- else
- scwc.save(new NullProgressMonitor());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#initialize(com.ibm.wtp.server.core.IServerState)
- */
- public void initialize(IServerState liveServer) {
- this.liveServer = liveServer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#dispose()
- */
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#getPublisher(java.util.List,
- * com.ibm.wtp.server.core.model.IModule)
- */
- public IPublisher getPublisher(List parents, IModule module) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#updateConfiguration()
- */
- public void updateConfiguration() {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#updateModule(com.ibm.wtp.server.core.model.IModule,
- * com.ibm.wtp.server.core.resources.IModuleResourceDelta)
- */
- public void updateModule(IModule module, IModuleResourceDelta delta) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#publishStart(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus publishStart(IProgressMonitor monitor) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#publishConfiguration(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus publishConfiguration(IProgressMonitor monitor) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#publishStop(org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus publishStop(IProgressMonitor monitor) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#canModifyModules(com.ibm.wtp.server.core.model.IModule[],
- * com.ibm.wtp.server.core.model.IModule[])
- */
- public IStatus canModifyModules(IModule[] add, IModule[] remove) {
- // TODO Auto-generated method stub
- return Status.OK_STATUS;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#getModules()
- */
- public IModule[] getModules() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#getRepairCommands(com.ibm.wtp.server.core.model.IModuleFactoryEvent[],
- * com.ibm.wtp.server.core.model.IModuleEvent[])
- */
- public ITask[] getRepairCommands(IModuleFactoryEvent[] factoryEvent,
- IModuleEvent[] moduleEvent) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#getChildModules(com.ibm.wtp.server.core.model.IModule)
- */
- public List getChildModules(IModule module) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#getParentModules(com.ibm.wtp.server.core.model.IModule)
- */
- public List getParentModules(IModule module) throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.server.core.model.IServerDelegate#setLaunchDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
- */
- public void setLaunchDefaults(ILaunchConfigurationWorkingCopy workingCopy) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerWorkingCopyDelegate#handleSave(byte,
- * org.eclipse.core.runtime.IProgressMonitor)
- */
- public void handleSave(byte id, IProgressMonitor monitor) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.IServerDelegate#getModuleState(org.eclipse.wst.server.core.model.IModule)
- */
- public byte getModuleState(IModule module) {
- // TODO Auto-generated method stub
- return 0;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/PingThread.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/PingThread.java
deleted file mode 100644
index 10badb7..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/PingThread.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.jst.server.generic.internal.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.FileNotFoundException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.eclipse.debug.core.ILaunchManager;
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerState;
-/**
- * Thread used to ping server to test when it is started.
- */
-public class PingThread extends Thread {
- // delay before pinging starts
- private static final int PING_DELAY = 2000;
-
- // delay between pings
- private static final int PING_INTERVAL = 250;
-
- // maximum number of pings before giving up
- private static final int MAX_PINGS = 56; // total: 16 seconds
-
- private boolean stop = false;
- private String mode;
- private String url = "";
- private GenericServer serverType;
- private IServerState control;
-
- public PingThread(GenericServer serverType, IServerState control, String url, String mode) { super();
- this.control = control;
- this.url = url;
- this.mode = mode;
- this.serverType = serverType;
- setDaemon(true);
- }
-
- /**
- * Ping the server until it is started. Then set the server
- * state to SERVER_STARTED.
- */
- public void run() {
- int count = 0;
- try {
- sleep(PING_DELAY);
- } catch (Exception e) { }
- while (!stop) {
- try {
- if (count == MAX_PINGS) {
- serverType.stop();
- stop = true;
- break;
- }
- Trace.trace(Trace.FINEST, "Ping: pinging");
- URL pingUrl = new URL(url);
- URLConnection conn = pingUrl.openConnection();
- ((HttpURLConnection)conn).getResponseCode();
- count++;
-
- // ping worked - server is up
- if (!stop) {
- Trace.trace(Trace.FINEST, "Ping: success");
- Thread.sleep(200);
- if (ILaunchManager.DEBUG_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_DEBUG);
- else if (ILaunchManager.PROFILE_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_PROFILE);
- else
- control.setServerState(IServer.SERVER_STARTED);
- }
- stop = true;
- } catch (FileNotFoundException fe) {
- try { Thread.sleep(200); } catch (Exception e) { }
- if (ILaunchManager.DEBUG_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_DEBUG);
- else if (ILaunchManager.PROFILE_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_PROFILE);
- else
- control.setServerState(IServer.SERVER_STARTED);
- stop = true;
- } catch (Exception e) {
- Trace.trace(Trace.FINEST, "Ping: failed");
- // pinging failed
- if (!stop) {
- try {
- sleep(PING_INTERVAL);
- } catch (InterruptedException e2) { }
- }
- }
- }
- }
-
- /**
- * Tell the pinging to stop.
- */
- public void stopPinging() {
- //Trace.trace("Ping: stopping");
- stop = true;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionManager.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionManager.java
deleted file mode 100644
index 7241931..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionManager.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.jst.server.generic.internal.xml.XMLUtils;
-/**
- * Manages the retrieaval of ServerTypeDefinitions.
- *
- * @author Gorkem Ercan
- */
-
-public class ServerTypeDefinitionManager
-{
- private XMLUtils fXmlUtils;
-
- public ServerTypeDefinitionManager(URL serverDefinitionURL)
- {
- super();
- fXmlUtils = new XMLUtils(serverDefinitionURL);
- }
-
-// public ServerTypeDefinition getServerRuntimeDefinition(String id)
-// {
-// return fXmlUtils.getServerTypeDefinitionNamed(id);
-// }
-
- public ServerTypeDefinition getServerRuntimeDefinition(String id, Map properties)
- {
- ServerTypeDefinition definition = fXmlUtils.getServerTypeDefinitionNamed(id);
- definition.setPropertyValues(properties);
- return definition;
- }
-
- public ServerTypeDefinition[] getServerTypeDefinitions()
- {
- List definitionList = fXmlUtils.getServerTypeDefinitions();
- return (ServerTypeDefinition[])definitionList.toArray(new ServerTypeDefinition[definitionList.size()]);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionUtil.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionUtil.java
deleted file mode 100644
index d3d3ea4..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/ServerTypeDefinitionUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.jst.server.generic.internal.core;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.server.generic.core.CorePlugin;
-import org.eclipse.jst.server.generic.internal.xml.ClasspathItem;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * Utility for working with rthe server type definition.
- * This class has only static methods.
- *
- * @author Gorkem Ercan
- */
-public class ServerTypeDefinitionUtil
-{
- /**
- *
- * @param runtime
- * @return
- */
- public static ServerTypeDefinition getServerTypeDefinition(IRuntime runtime)
- {
- String serverType = runtime.getAttribute(GenericServerRuntime.SERVER_DEFINITION_ID,(String)null);
- Map properties = runtime.getAttribute(GenericServerRuntime.SERVER_INSTANCE_PROPERTIES,(Map)null);
- ServerTypeDefinition definition =
- CorePlugin.getDefault().getServerTypeDefinitionManager().getServerRuntimeDefinition(serverType,properties);
- return definition;
- }
-
- public static IClasspathEntry[] getServerClassPathEntry(IRuntime runtime)
- {
- ServerTypeDefinition definition = getServerTypeDefinition(runtime);
- List cpathList =definition.getServerClassPath();
- ArrayList entryList = new ArrayList();
- for (int i = 0; i < cpathList.size(); i++)
- {
- ClasspathItem item = (ClasspathItem) cpathList.get(i);
- String cpath = item.getResolvedClasspath(definition);
- IClasspathEntry entry = JavaCore.newLibraryEntry(new Path(cpath),null,null );
- entryList.add(entry);
- }
-
- return (IClasspathEntry[])entryList.toArray(new IClasspathEntry[entryList.size()]);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/Trace.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/Trace.java
deleted file mode 100644
index 6484869..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/Trace.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jst.server.generic.internal.core;
-
-import org.eclipse.jst.server.generic.core.CorePlugin;
-
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * Helper class to route trace output.
- */
-public class Trace {
- public static byte CONFIG = 0;
- public static byte WARNING = 1;
- public static byte SEVERE = 2;
- public static byte FINEST = 3;
- public static byte FINER = 4;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(byte level, String s) {
- Trace.trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param s java.lang.String
- * @param t java.lang.Throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (!CorePlugin.getDefault().isDebugging())
- return;
-
- System.out.println(s);
- if (t != null)
- t.printStackTrace();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(String s) {
- trace(s, null);
- }
-
- /**
- * Trace the given exception.
- *
- * @param s java.lang.String
- * @param e java.lang.Throwable
- */
- public static void trace(String s, Throwable t) {
- trace(FINEST, s, t);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ClasspathItem.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ClasspathItem.java
deleted file mode 100644
index 12814e9..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ClasspathItem.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.xml;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-
-public class ClasspathItem {
- public static final int VARIABLE = 0;
- public static final int ABSOLUTE = 1;
-
- int type;
- String classpath;
-
- /**
- * @return String
- */
- public String getClasspath() {
- return classpath;
- }
- /**
- * @return String
- */
- public String getResolvedClasspath(ServerTypeDefinition definition) {
- return definition.resolveProperties(classpath);
- }
- /**
- * @return int
- */
- public int getType() {
- return type;
- }
-
- /**
- * Sets the classpath.
- * @param classpath The classpath to set
- */
- public void setClasspath(String classpath) {
- this.classpath = classpath;
- }
-
- /**
- * Sets the type.
- * @param type The type to set
- */
- public void setType(int type) {
- this.type = type;
- }
- public void setTypeStr(String typeStr) {
- if ("variable".equals(typeStr)) {
- type = VARIABLE;
- } else if ("absolute".equals(typeStr)) {
- type = ABSOLUTE;
- }
-
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "<jar type=\""
- + (type == 0 ? "variable" : "absolute")
- + "\">"
- + this.getClasspath()
- + "</jar>";
- }
-
- public boolean exists(ServerTypeDefinition def) {
- if (getType() == VARIABLE) {
- String resolved = def.resolveProperties(this.getClasspath());
- IClasspathEntry entry =
- JavaCore.newVariableEntry(new Path(resolved), null, null);
-
- IClasspathEntry res = JavaCore.getResolvedClasspathEntry(entry);
- return (res != null);
- }
- File f = new File(def.resolveProperties(this.getClasspath()));
- return f.exists();
- }
-
- public void setRawClasspathFor(ServerTypeDefinition def, String rawPath) {
- File f = new File(rawPath);
- if (!f.exists())
- return;
- try {
- String path = f.getCanonicalPath().replace('\\', '/');
- String var = def.getClasspathVariable();
- int start = path.indexOf(var);
- if (start >= 0) {
- path =
- "${classPathVariableName}"
- + path.substring(start + var.length());
- setType(VARIABLE);
- setClasspath(path);
-
- } else {
- setType(ABSOLUTE);
- setClasspath(path);
- }
- } catch (IOException e) {
- setType(ABSOLUTE);
- setClasspath(rawPath);
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/IXMLTagProcessor.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/IXMLTagProcessor.java
deleted file mode 100644
index ca2655d..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/IXMLTagProcessor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.xml;
-
-import org.xml.sax.Attributes;
-
-public interface IXMLTagProcessor
-{
- public void assesTagEnd(String tagName, String content);
- public void assesTagStart(String tagName, Attributes attributes);
- public Object getConfigObject();
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerAdminTool.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerAdminTool.java
deleted file mode 100644
index ef0be15..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerAdminTool.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.internal.xml;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * @author Naci Dai
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ServerAdminTool {
- final public static int NONE = 0;
- final public static int WEB = 1;
- final public static int EJB = 2;
- final public static int EAR = 3;
-
- final public static String NOTDEFINED = "<NOT DEFINED>";
- final public static String DEFINED = "<DEFINED>";
- private String mainClass;
-
- public class Module {
-
- private int type = -1;
- private String deploy = "";
- private String undeploy = "";
- private Module webModules = null;
- private Module ejbModules = null;
- /**
- * @return
- */
- public String getDeploy() {
- return deploy;
- }
-
- /**
- * @return
- */
- public Module getEjbModules() {
- return ejbModules;
- }
-
- /**
- * @return
- */
- public int getType() {
- return type;
- }
-
- /**
- * @return
- */
- public String getUndeploy() {
- return undeploy;
- }
-
- /**
- * @return
- */
- public Module getWebModules() {
- return webModules;
- }
-
- /**
- * @param string
- */
- public void setDeploy(String string) {
- if (string == null)
- deploy = "";
- else
- deploy = string;
- }
-
- /**
- * @param string
- */
- public void setEjbModules(Module mod) {
- ejbModules = mod;
- }
-
- /**
- * @param i
- */
- public void setType(int i) {
- type = i;
- }
-
- /**
- * @param string
- */
- public void setUndeploy(String string) {
- if (string == null)
- undeploy = "";
- else
- undeploy = string;
- }
-
- /**
- * @param string
- */
- public void setWebModules(Module mod) {
- webModules = mod;
- }
-
- }
-
- private Module web;
- private Module ejb;
- private Module ear;
- private boolean defined = false;
-
- private ArrayList toolClassPath;
- private ServerTypeDefinition definition;
-
- public ServerAdminTool(ServerTypeDefinition def) {
- mainClass = NOTDEFINED;
- definition = def;
- toolClassPath = new ArrayList();
- web = new Module();
- web.setType(WEB);
- ejb = new Module();
- ejb.setType(EJB);
- ear = new Module();
- ear.setType(EJB);
- ear.setWebModules(new Module());
- ear.setEjbModules(new Module());
-
- }
-
- public void addServerClasspath(ClasspathItem classpathItem) {
- this.getToolClassPath().add(classpathItem);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- String xml = "";
- xml
- += ("\n<adminTool>"
- + "\n\t<web>"
- + (this.getWeb().getDeploy().length() > 0
- ? "\n\t\t<deploy><![CDATA["
- + this.getWeb().getDeploy()
- + "]]></deploy>"
- : "<deploy />")
- + (this.getWeb().getUndeploy().length() > 0
- ? "\n\t\t<undeploy><![CDATA["
- + this.getWeb().getUndeploy()
- + "]]></undeploy>"
- : "<undeploy />")
- + "\n\t</web>"
- + "\n\t<ejb>"
- + (this.getEjb().getDeploy().length() > 0
- ? "\n\t\t<deploy><![CDATA["
- + this.getEjb().getDeploy()
- + "]]></deploy>"
- : "<deploy />")
- + (this.getEjb().getUndeploy().length() > 0
- ? "\n\t\t<undeploy><![CDATA["
- + this.getEjb().getUndeploy()
- + "]]></undeploy>"
- : "<undeploy />")
- + "\n\t</ejb>"
- + "\n\t<ear>"
- + (this.getEar().getDeploy().length() > 0
- ? "\n\t\t<deploy><![CDATA["
- + this.getEar().getDeploy()
- + "]]></deploy>"
- : "<deploy />")
- + (this.getEar().getUndeploy().length() > 0
- ? "\n\t\t<undeploy><![CDATA["
- + this.getEar().getUndeploy()
- + "]]></undeploy>"
- : "<undeploy />")
- + "\n\t\t<webModule>"
- + (this.getEar().getWebModules().getDeploy().length() > 0
- ? "\n\t\t\t<deploy><![CDATA["
- + this.getEar().getWebModules().getDeploy()
- + "]]></deploy>"
- : "<deploy />")
- + (this.getEar().getWebModules().getUndeploy().length() > 0
- ? "\n\t\t\t<undeploy><![CDATA["
- + this.getEar().getWebModules().getUndeploy()
- + "]]></undeploy>"
- : "<undeploy />")
- + "\n\t\t</webModule>"
- + "\n\t\t<ejbModule>"
- + (this.getEar().getEjbModules().getDeploy().length() > 0
- ? "\n\t\t\t<deploy><![CDATA["
- + this.getEar().getEjbModules().getDeploy()
- + "]]></deploy>"
- : "<deploy />")
- + (this.getEar().getEjbModules().getUndeploy().length() > 0
- ? "\n\t\t\t<undeploy><![CDATA["
- + this.getEar().getEjbModules().getUndeploy()
- + "]]></undeploy>"
- : "<undeploy />")
- + "\n\t\t</ejbModule>"
- + "\n\t</ear>"
- + "\n</adminTool>");
-
- xml += "\n<adminToolPath>";
- Iterator props = this.getToolClassPath().iterator();
- while (props.hasNext()) {
- xml += "\n\t" + props.next().toString();
- }
- xml += "\n</adminToolPath>";
-
- return xml;
-
- }
-
- /**
- * @return
- */
- public boolean isDefined() {
- return defined;
- }
-
- public String getRuntimeClasspath(IJavaProject proj) throws CoreException {
- Iterator iter = this.getToolClassPath().iterator();
- ArrayList newPath = new ArrayList();
- String cp = "";
- while (iter.hasNext()) {
- ClasspathItem element = (ClasspathItem) iter.next();
- String lib =
- this.definition.resolveProperties(element.getClasspath());
- switch (element.getType()) {
- case ClasspathItem.VARIABLE :
- IClasspathEntry entry =
- JavaCore.newVariableEntry(new Path(lib), null, null);
- RuntimeClasspathEntry rentry =
- new RuntimeClasspathEntry(entry);
- newPath.add(rentry);
- break;
-
- default :
- IClasspathEntry lentry =
- JavaCore.newLibraryEntry(new Path(lib), null, null);
- RuntimeClasspathEntry lrentry =
- new RuntimeClasspathEntry(lentry);
- newPath.add(lrentry);
- break;
- }
- }
-
- IRuntimeClasspathEntry[] resultList =
- (IRuntimeClasspathEntry[]) newPath.toArray(
- new IRuntimeClasspathEntry[newPath.size()]);
- // 1. remove bootpath entries
- // 2. resolve & translate to local file system paths
- List resolved = new ArrayList(resultList.length);
- for (int i = 0; i < resultList.length; i++) {
- IRuntimeClasspathEntry entry = resultList[i];
- if (entry.getClasspathProperty()
- == IRuntimeClasspathEntry.USER_CLASSES) {
- IRuntimeClasspathEntry[] entries =
- JavaRuntime.resolveRuntimeClasspathEntry(entry, proj);
- for (int j = 0; j < entries.length; j++) {
- String location = entries[j].getLocation();
- if (location != null) {
- resolved.add(location);
- cp += location + File.pathSeparator;
- }
- }
- }
- }
- //return (String[])resolved.toArray(new String[resolved.size()]);
- return cp;
-
- }
-
- /**
- * @return
- */
- public ServerTypeDefinition getDefinition() {
- return definition;
- }
-
- /**
- * @return
- */
- public Module getEar() {
- return ear;
- }
-
- /**
- * @return
- */
- public Module getEjb() {
- return ejb;
- }
-
- /**
- * @return
- */
- public String getMainClass() {
- return mainClass;
- }
-
- /**
- * @return
- */
- public ArrayList getToolClassPath() {
- return toolClassPath;
- }
-
- /**
- * @return
- */
- public Module getWeb() {
- return web;
- }
-
- /**
- * @param definition
- */
- public void setDefinition(ServerTypeDefinition definition) {
- this.definition = definition;
- }
-
- /**
- * @param module
- */
- public void setEar(Module module) {
- ear = module;
- }
-
- /**
- * @param module
- */
- public void setEjb(Module module) {
- ejb = module;
- }
-
- /**
- * @param string
- */
- public void setMainClass(String string) {
- mainClass = string;
- }
-
- /**
- * @param list
- */
- public void setToolClassPath(ArrayList list) {
- toolClassPath = list;
- }
-
- /**
- * @param module
- */
- public void setWeb(Module module) {
- web = module;
- }
-
- /**
- * @param b
- */
- public void setDefined(boolean b) {
- defined = b;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinition.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinition.java
deleted file mode 100644
index 0680550..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinition.java
+++ /dev/null
@@ -1,777 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.xml;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.JavaRuntime;
-/**
- * Holds/presents the XML server definition file. If this object has propertyValues Map
- * the returned values for properties are resolved according to this values. If
- * propertyValues are not present the default values in the XML definition file is
- * resolved..
- * @author Naci Dai
- * @author Gorkem Ercan
- */
-public class ServerTypeDefinition {
-
- private ServerAdminTool adminTool;
-
- private File definitionFile;
- private Map fPropertyValues;
-
- private String name;
- private String id;
- private String vendor;
- private String description;
- private String version;
-
- private boolean webModules;
- private boolean ejbModules;
- private boolean earModules;
-
- private ArrayList properties;
- private ArrayList serverClassPath;
- private ArrayList clientClassPath;
- private ArrayList projectClassPath;
-
- private String webModulesDeployDirectory;
- private String ejbModulesDeployDirectory;
- private String earModulesDeployDirectory;
-
- private String jndiInitialContextFactory;
- private String jndiProviderUrl;
-
- private String startClass;
- private String startWorkingDirectory;
- private String startVmParameters;
- private String startProgramArguments;
-
- private String stopClass;
- private String stopWorkingDirectory;
- private String stopVmParameters;
- private String stopProgramArguments;
-
- private String serverHome;
- /**
- *
- */
- public ServerTypeDefinition() {
- properties = new ArrayList();
- serverClassPath = new ArrayList();
- clientClassPath = new ArrayList();
- projectClassPath = new ArrayList();
- adminTool = new ServerAdminTool(this);
- }
- /**
- * @return Returns the description.
- */
- public String getDescription() {
- return description;
- }
- /**
- * @param description The description to set.
- */
- public void setDescription(String description) {
- this.description = description;
- }
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
- /**
- * @param id The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
- /**
- * @return Returns the vendor.
- */
- public String getVendor() {
- return vendor;
- }
- /**
- * @param vendor The vendor to set.
- */
- public void setVendor(String vendor) {
- this.vendor = vendor;
- }
- /**
- * @return Returns the version.
- */
- public String getVersion() {
- return version;
- }
- /**
- * @param version The version to set.
- */
- public void setVersion(String version) {
- this.version = version;
- }
-
-
-
- public void addServerClasspath(ClasspathItem classpathItem) {
- this.getServerClassPath().add(classpathItem);
- }
-
- public void addClientClasspath(ClasspathItem classpathItem) {
- this.getClientClassPath().add(classpathItem);
- }
- public void addProjectClasspath(ClasspathItem classpathItem) {
- this.getClientClassPath().add(classpathItem);
- }
-
- /**
- * @return ArrayList
- */
- public ArrayList getClientClassPath() {
- return clientClassPath;
- }
-
- /**
- * @return ArrayList
- */
- public ArrayList getProjectClassPath() {
- return projectClassPath;
- }
-
- /**
- * @return String
- */
- public String getEarModulesDeployDirectory() {
- return resolveProperties(earModulesDeployDirectory);
- }
-
- /**
- * @return String
- */
- public String getEjbModulesDeployDirectory() {
- return resolveProperties(ejbModulesDeployDirectory);
- }
-
- /**
- * @return ArrayList
- */
- public ArrayList getProperties() {
- return properties;
- }
-
- public String getClasspathVariableName() {
-
- ServerTypeDefinitionProperty prop =
- getPropertyNamed("classPathVariableName");
- if (prop != null)
- return prop.getDefaultValue();
- return null;
- }
- public String getClasspathVariable() {
-
- ServerTypeDefinitionProperty prop = getPropertyNamed("classPath");
- if (prop != null)
- return prop.getDefaultValue();
- return null;
- }
-
- public ServerTypeDefinitionProperty getPropertyNamed(String id) {
- Iterator itr = getProperties().iterator();
- while (itr.hasNext()) {
- ServerTypeDefinitionProperty element =
- (ServerTypeDefinitionProperty) itr.next();
- if (id.equals(element.getId()))
- return element;
- }
- return null;
- }
- /**
- * @return ArrayList
- */
- public ArrayList getServerClassPath() {
- return serverClassPath;
- }
-
- /**
- * @return String
- */
- public String getStartClass() {
- return startClass;
- }
-
- /**
- * @return String
- */
- public String getStartProgramArguments() {
- return resolveProperties(startProgramArguments);
- }
-
- /**
- * @return String
- */
- public String getStartVmParameters() {
- return resolveProperties(startVmParameters);
- }
-
- /**
- * @return String
- */
- public String getStopClass() {
- return stopClass;
- }
-
- /**
- * @return String
- */
- public String getStopProgramArguments() {
- return resolveProperties(stopProgramArguments);
- }
-
- /**
- * @return String
- */
- public String getStopVmParameters() {
- return resolveProperties(stopVmParameters);
- }
-
- /**
- * @return String
- */
- public String getWebModulesDeployDirectory() {
- return this.resolveProperties(webModulesDeployDirectory);
- }
-
- /**
- * Sets the clientClassPath.
- * @param clientClassPath The clientClassPath to set
- */
- public void setClientClassPath(ArrayList clientClassPath) {
- this.clientClassPath = clientClassPath;
- }
-
- /**
- * Sets the earModulesDeployDirectory.
- * @param earModulesDeployDirectory The earModulesDeployDirectory to set
- */
- public void setEarModulesDeployDirectory(String earModulesDeployDirectory) {
- this.earModulesDeployDirectory = earModulesDeployDirectory;
- }
-
- /**
- * Sets the ejbModulesDeployDirectory.
- * @param ejbModulesDeployDirectory The ejbModulesDeployDirectory to set
- */
- public void setEjbModulesDeployDirectory(String ejbModulesDeployDirectory) {
- this.ejbModulesDeployDirectory = ejbModulesDeployDirectory;
- }
-
- /**
- * Sets the properties.
- * @param properties The properties to set
- */
- public void setProperties(ArrayList properties) {
- this.properties = properties;
- }
-
- /**
- * Sets the serverClassPath.
- * @param serverClassPath The serverClassPath to set
- */
- public void setServerClassPath(ArrayList serverClassPath) {
- this.serverClassPath = serverClassPath;
- }
-
-
- /**
- * Sets the ProjectClassPath.
- * @param serverClassPath The ProjectClassPath to set
- */
- public void setProjectClassPath(ArrayList projectClassPath) {
- this.projectClassPath = projectClassPath;
- }
-
- /**
- * Sets the startClass.
- * @param startClass The startClass to set
- */
- public void setStartClass(String startClass) {
- this.startClass = startClass;
- }
-
- /**
- * Sets the startProgramArguments.
- * @param startProgramArguments The startProgramArguments to set
- */
- public void setStartProgramArguments(String startProgramArguments) {
- this.startProgramArguments = startProgramArguments;
- }
-
- /**
- * Sets the startVmParameters.
- * @param startVmParameters The startVmParameters to set
- */
- public void setStartVmParameters(String startVmParameters) {
- this.startVmParameters = startVmParameters;
- }
-
- /**
- * Sets the stopClass.
- * @param stopClass The stopClass to set
- */
- public void setStopClass(String stopClass) {
- this.stopClass = stopClass;
- }
-
- /**
- * Sets the stopProgramArguments.
- * @param stopProgramArguments The stopProgramArguments to set
- */
- public void setStopProgramArguments(String stopProgramArguments) {
- this.stopProgramArguments = stopProgramArguments;
- }
-
- /**
- * Sets the stopVmParameters.
- * @param stopVmParameters The stopVmParameters to set
- */
- public void setStopVmParameters(String stopVmParameters) {
- this.stopVmParameters = stopVmParameters;
- }
-
- /**
- * Sets the webModulesDeployDirectory.
- * @param webModulesDeployDirectory The webModulesDeployDirectory to set
- */
- public void setWebModulesDeployDirectory(String webModulesDeployDirectory) {
- this.webModulesDeployDirectory = webModulesDeployDirectory;
- }
-
- /**
- * @return boolean
- */
- public boolean isEarModules() {
- return earModules;
- }
-
- /**
- * @return boolean
- */
- public boolean isEjbModules() {
- return ejbModules;
- }
-
- /**
- * @return String
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return boolean
- */
- public boolean isWebModules() {
- return webModules;
- }
-
- /**
- * Sets the earModules.
- * @param earModules The earModules to set
- */
- public void setEarModules(boolean earModules) {
- this.earModules = earModules;
- }
-
- /**
- * Sets the ejbModules.
- * @param ejbModules The ejbModules to set
- */
- public void setEjbModules(boolean ejbModules) {
- this.ejbModules = ejbModules;
- }
-
- /**
- * Sets the name.
- * @param name The name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Sets the webModules.
- * @param webModules The webModules to set
- */
- public void setWebModules(boolean webModules) {
- this.webModules = webModules;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- String xml =
- "\n<serverDefinition "
- + "\n\t name=\""
- + getName()
- + "\""
- + "\n\t ejbModules=\""
- + isEjbModules()
- + "\""
- + "\n\t webModules=\""
- + isWebModules()
- + "\""
- + "\n\t earModules=\""
- + isEarModules()
- + "\">";
- Iterator props = getProperties().iterator();
- while (props.hasNext()) {
- xml += props.next().toString();
- }
-
- xml
- += ("\n<serverHome>"
- + getServerHome()
- + "</serverHome>"
- + "\n<webModulesDeployDirectory>"
- + getWebModulesDeployDirectory()
- + "</webModulesDeployDirectory>"
- + "\n<ejbModulesDeployDirectory>"
- + getEjbModulesDeployDirectory()
- + "</ejbModulesDeployDirectory>"
- + "\n<earModulesDeployDirectory>"
- + getEarModulesDeployDirectory()
- + "</earModulesDeployDirectory>"
- + "\n<jndiInitialContextFactory>"
- + getJndiInitialContextFactory()
- + "</jndiInitialContextFactory>"
- + "\n<jndiProviderUrl>"
- + getJndiProviderUrl()
- + "</jndiProviderUrl>"
- + "\n<startClass>"
- + getStartClass()
- + "</startClass>"
- + "\n<startWorkingDirectory>"
- + getStartWorkingDirectory()
- + "</startWorkingDirectory>"
- + "\n<startVmParameters>"
- + getStartVmParameters()
- + "</startVmParameters>"
- + "\n<startProgramArguments>"
- + getStartProgramArguments()
- + "</startProgramArguments>"
- + "\n<stopClass>"
- + getStopClass()
- + "</stopClass>"
- + "\n<stopWorkingDirectory>"
- + getStopWorkingDirectory()
- + "</stopWorkingDirectory>"
- + "\n<stopVmParameters>"
- + getStopVmParameters()
- + "</stopVmParameters>"
- + "\n<stopProgramArguments>"
- + getStopProgramArguments()
- + "</stopProgramArguments>");
-
- xml += "\n<serverClassPath>";
- props = getServerClassPath().iterator();
- while (props.hasNext()) {
- xml += "\n\t" + props.next().toString();
- }
- xml += "\n</serverClassPath>";
-
- xml += "\n<clientClassPath>";
- props = getClientClassPath().iterator();
- while (props.hasNext()) {
- xml += "\n\t" + props.next().toString();
- }
- xml += "\n</clientClassPath>";
-
- xml += "\n<projectClassPath>";
- props = getProjectClassPath().iterator();
- while (props.hasNext()) {
- xml += "\n\t" + props.next().toString();
- }
- xml += "\n</projectClassPath>";
-
- if( getAdminTool().isDefined() )
- xml += getAdminTool().toString();
-
- xml += "\n</serverDefinition>";
- return xml;
- }
-
- /**
- * @return String
- */
- public String getStartWorkingDirectory() {
- return resolveProperties(startWorkingDirectory);
- }
-
- /**
- * @return String
- */
- public String getStopWorkingDirectory() {
- return resolveProperties(stopWorkingDirectory);
- }
-
- /**
- * Sets the startWorkingDirectory.
- * @param startWorkingDirectory The startWorkingDirectory to set
- */
- public void setStartWorkingDirectory(String startWorkingDirectory) {
- this.startWorkingDirectory = startWorkingDirectory;
- }
-
- /**
- * Sets the stopWorkingDirectory.
- * @param stopWorkingDirectory The stopWorkingDirectory to set
- */
- public void setStopWorkingDirectory(String stopWorkingDirectory) {
- this.stopWorkingDirectory = stopWorkingDirectory;
- }
-
- /**
- * @return String
- */
- public String getJndiInitialContextFactory() {
- return jndiInitialContextFactory;
- }
-
- /**
- * @return String
- */
- public String getJndiProviderUrl() {
- return resolveProperties(jndiProviderUrl);
- }
-
- /**
- * Sets the jndiInitialContextFactory.
- * @param jndiInitialContextFactory The jndiInitialContextFactory to set
- */
- public void setJndiInitialContextFactory(String jndiInitialContextFactory) {
- this.jndiInitialContextFactory = jndiInitialContextFactory;
- }
-
- /**
- * Sets the jndiProviderUrl.
- * @param jndiProviderUrl The jndiProviderUrl to set
- */
- public void setJndiProviderUrl(String jndiProviderUrl) {
- this.jndiProviderUrl = jndiProviderUrl;
- }
-
- /**
- * @return File
- */
- public File getDefinitionFile() {
- return definitionFile;
- }
-
- /**
- * Sets the definitionFile.
- * @param definitionFile The definitionFile to set
- */
- public void setDefinitionFile(File definitionFile) {
- this.definitionFile = definitionFile;
- }
-
-
- protected String resolveProperties(
- String proppedString) {
- HashMap cache = new HashMap(getProperties().size());
- Iterator itr = getProperties().iterator();
- while (itr.hasNext()) {
- ServerTypeDefinitionProperty element =(ServerTypeDefinitionProperty) itr.next();
- String value = element.getDefaultValue();
- if(fPropertyValues!= null && fPropertyValues.containsKey(element.getId()))
- value=(String)fPropertyValues.get(element.getId());
- cache.put(element.getId(), value);
- }
- //String vmPath = install.getInstallLocation().getCanonicalPath();
- //vmPath = vmPath.replace('\\', '/');
- cache.put("jrePath", "JRE");
-
- String str = resolvePropertiesFromCache(proppedString, cache);
- str = fixPassthroughProperties(str);
- return str;
- }
-
- /**
- * @param str
- * @return
- */
- private String fixPassthroughProperties(String str) {
- String resolvedString = str;
- if (isPassPropertyLeft(resolvedString)) {
- resolvedString = fixParam(resolvedString);
- resolvedString = fixPassthroughProperties(resolvedString);
- }
- return resolvedString;
- }
-
- private String resolvePropertiesFromCache(
- String proppedString,
- HashMap cache) {
- String resolvedString = proppedString;
- if (isPropertyLeft(resolvedString)) {
- resolvedString = resolveProperty(resolvedString, cache);
- resolvedString = resolvePropertiesFromCache(resolvedString, cache);
- }
- return resolvedString;
- }
-
- private boolean isPropertyLeft(String str) {
- return str.indexOf("${") >= 0;
- }
- private boolean isPassPropertyLeft(String str) {
- return str.indexOf("%{") >= 0;
- }
-
- private String resolveProperty(String proppedString, HashMap cache) {
- String str = proppedString;
- int start = str.indexOf("${");
- int end = str.indexOf("}", start);
- String key = str.substring(start + 2, end);
-
- return str.substring(0, start)
- + cache.get(key)
- + str.substring(end + 1);
- }
-
- private String fixParam(String proppedString) {
- String str = proppedString;
- int start = str.indexOf("%{");
- return str.substring(0, start)
- + "${"
- + str.substring(start+2);
- }
-
- /**
- * @return String
- */
- public String getServerHome() {
- return serverHome;
- }
-
- public void setServerHome(String serverHome) {
- this.serverHome = serverHome;
- }
-
- /**
- * @return
- */
- public ServerAdminTool getAdminTool() {
- return adminTool;
- }
-
- /**
- * @param tool
- */
- public void setAdminTool(ServerAdminTool tool) {
- adminTool = tool;
- }
-
-
-
- public Object getPropertyValue(Object id)
- {
- ServerTypeDefinitionProperty prop = getPropertyNamed((String)id);
- if(prop != null)
- return prop.getDefaultValue();
- return null;
- }
-
- public boolean isPropertySet(Object id)
- {
- ServerTypeDefinitionProperty prop = getPropertyNamed((String)id);
- return (prop != null);
- }
-
- public void setPropertyValue(Object id, Object value)
- {
- ServerTypeDefinitionProperty prop = getPropertyNamed((String)id);
- int idx = getProperties().indexOf(prop);
- if(idx >= 0)
- {
- prop.setDefaultValue((String)value);
- getProperties().set(idx, prop);
- }
- }
- /**
- * @return
- */
- public String getPort() {
- ServerTypeDefinitionProperty prop =
- getPropertyNamed("port");
- if (prop != null)
- return prop.getDefaultValue();
- return null;
- }
-
- public List getServerClasspathMementos() {
- List cpathList =getServerClassPath();
- ArrayList mementoList = new ArrayList();
- for (int i = 0; i < cpathList.size(); i++) {
- ClasspathItem item = (ClasspathItem) cpathList.get(i);
- String cpath = resolveProperties(
- item.getClasspath());
- String memento = null;
- try {
- memento = JavaRuntime.newArchiveRuntimeClasspathEntry(
- new Path(cpath)).getMemento();
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- mementoList.add(memento);
- }
- return mementoList;
- }
-
-
- public Map getPropertyValues() {
- return fPropertyValues;
- }
- public void setPropertyValues(Map propertyValue) {
- fPropertyValues = propertyValue;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinitionProperty.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinitionProperty.java
deleted file mode 100644
index 1ebb09e..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/ServerTypeDefinitionProperty.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.xml;
-
-public class ServerTypeDefinitionProperty {
- public static final int TYPE_STRING = 0;
- public static final int TYPE_FILE = 1;
- public static final int TYPE_DIRECTORY = 2;
- public static final int TYPE_BOOLEAN = 3;
- public static final String CONTEXT_SERVER = "server";
- public static final String CONTEXT_RUNTIME = "runtime";
-
-
- private String id;
- private String label;
- private int type;
- private String defaultValue;
- private String context;
-
- /**
- * @return String
- */
- public String getDefaultValue() {
- return defaultValue;
- }
-
- /**
- * @return String
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return String
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * @return int
- */
- public int getType() {
- return type;
- }
-
- /**
- * Sets the defaultValue.
- * @param defaultValue The defaultValue to set
- */
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- /**
- * Sets the id.
- * @param id The id to set
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * Sets the label.
- * @param label The label to set
- */
- public void setLabel(String label) {
- this.label = label;
- }
-
- /**
- * Sets the type.
- * @param type The type to set
- */
- public void setType(int type) {
- this.type = type;
- }
- public void setTypeFromStr(String str) {
- if ("string".equals(str))
- this.type = TYPE_STRING;
- else if ("directory".equals(str))
- this.type = TYPE_DIRECTORY;
- else if ("file".equals(str))
- this.type = TYPE_FILE;
- else if ("boolean".equals(str))
- this.type = TYPE_BOOLEAN;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "\n<property id=\""
- + this.getId()
- + "\"\n\tlabel=\""
- + this.getLabel()
- + "\"\n\ttype=\""
- + (type == TYPE_DIRECTORY
- ? "directory"
- : (type == TYPE_STRING
- ? "string"
- : (type == TYPE_FILE
- ? "file"
- : (type == TYPE_BOOLEAN ? "boolean" : "undefined"))))
- + "\"\n\tdefault=\""
- + this.getDefaultValue()
- + "\"\n\tcontext=\""+ this.getContext()
- +"\" />";
- }
-
- public String getContext() {
- return context;
- }
- public void setContext(String context) {
- this.context = context;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLConfiguration.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLConfiguration.java
deleted file mode 100644
index a7f6f6e..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLConfiguration.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.internal.xml;
-
-import java.util.ArrayList;
-
-import org.xml.sax.Attributes;
-
-public class XMLConfiguration implements IXMLTagProcessor {
-
- private boolean inEjbModule;
- private boolean inWebModule;
- private boolean inEar;
- private boolean inEjb;
- private boolean inWar;
- private boolean hasProjectPath = false;
- ServerTypeDefinition currentDefinition;
- ClasspathItem currentClasspathItem;
- ArrayList currentClasspath;
- boolean inAdminTool = false;
- /* (non-Javadoc)
- * @see com.objectlearn.jdt.xml.BuildConfigInterface#assesTagEnd(java.lang.String, java.lang.String)
- */
- public void assesTagEnd(String tagName, String content) {
- if ("webModulesDeployDirectory".equals(tagName)) {
- currentDefinition.setWebModulesDeployDirectory(content);
- } else if ("ejbModulesDeployDirectory".equals(tagName)) {
- currentDefinition.setEjbModulesDeployDirectory(content);
- } else if ("earModulesDeployDirectory".equals(tagName)) {
- currentDefinition.setEarModulesDeployDirectory(content);
- } else if ("jndiInitialContextFactory".equals(tagName)) {
- currentDefinition.setJndiInitialContextFactory(content);
- } else if ("jndiProviderUrl".equals(tagName)) {
- currentDefinition.setJndiProviderUrl(content);
- } else if ("startClass".equals(tagName)) {
- currentDefinition.setStartClass(content);
- } else if ("startWorkingDirectory".equals(tagName)) {
- currentDefinition.setStartWorkingDirectory(content);
- } else if ("startVmParameters".equals(tagName)) {
- currentDefinition.setStartVmParameters(content);
- } else if ("startProgramArguments".equals(tagName)) {
- currentDefinition.setStartProgramArguments(content);
- } else if ("stopClass".equals(tagName)) {
- currentDefinition.setStopClass(content);
- } else if ("stopWorkingDirectory".equals(tagName)) {
- currentDefinition.setStopWorkingDirectory(content);
- } else if ("stopVmParameters".equals(tagName)) {
- currentDefinition.setStopVmParameters(content);
- } else if ("stopProgramArguments".equals(tagName)) {
- currentDefinition.setStopProgramArguments(content);
- } else if ("jar".equals(tagName)) {
- currentClasspathItem.setClasspath(content);
- } else if ("serverClassPath".equals(tagName)) {
- currentDefinition.setServerClassPath(currentClasspath);
- } else if ("clientClassPath".equals(tagName)) {
- currentDefinition.setClientClassPath(currentClasspath);
- } else if ("projectClassPath".equals(tagName)) {
- currentDefinition.setProjectClassPath(currentClasspath);
- hasProjectPath = true;
- } else if ("adminToolPath".equals(tagName)) {
- currentDefinition.getAdminTool().setToolClassPath(currentClasspath);
- } else if ("serverHome".equals(tagName)) {
- currentDefinition.setServerHome(content);
- } else if ("adminTool".equals(tagName)) {
- inAdminTool = false;
- inEjbModule = false;
- inWebModule = false;
- inEar = false;
- inEjb = false;
- inWar = false;
-
- } else if ("serverDefinition".equals(tagName)) {
- //Finished parsing
- if (!hasProjectPath) {
- currentDefinition.setProjectClassPath(
- currentDefinition.getServerClassPath());
- }
- } else if (inAdminTool && "deploy".equals(tagName)) {
- if (inWar) {
- currentDefinition.getAdminTool().getWeb().setDeploy(content);
- } else if (inEjb) {
- currentDefinition.getAdminTool().getEjb().setDeploy(content);
- }else if (inWebModule) {
- currentDefinition.getAdminTool().getEar().getWebModules().setDeploy(content);
- } else if (inEjbModule) {
- currentDefinition.getAdminTool().getEar().getEjbModules().setDeploy(content);
- } else if (inEar && !inWebModule && !inEjbModule) {
- currentDefinition.getAdminTool().getEar().setDeploy(content);
- }
- } else if (inAdminTool && "undeploy".equals(tagName)) {
- if (inWar) {
- currentDefinition.getAdminTool().getWeb().setUndeploy(content);
- } else if (inEjb) {
- currentDefinition.getAdminTool().getEjb().setUndeploy(content);
- } else if (inEar && !inWebModule && !inEjbModule) {
- currentDefinition.getAdminTool().getEar().setUndeploy(content);
- } else if (inWebModule) {
- currentDefinition.getAdminTool().getEar().getWebModules().setUndeploy(content);
- } else if (inEjbModule) {
- currentDefinition.getAdminTool().getEar().getEjbModules().setUndeploy(content);
- }
- }else if (inAdminTool && "web".equals(tagName)) {
- inWar = false;
- }else if (inAdminTool && "ejb".equals(tagName)) {
- inEjb = false;
- }else if (inAdminTool && "ear".equals(tagName)) {
- inEar = false;
- }else if (inAdminTool && "webModule".equals(tagName)) {
- inWebModule = false;
- }else if (inAdminTool && "ejbModule".equals(tagName)) {
- inEjbModule = false;
- }
- }
-
- /* (non-Javadoc)
- * @see com.objectlearn.jdt.xml.BuildConfigInterface#assesTagStart(java.lang.String)
- */
- public void assesTagStart(String tagName, Attributes attributes) {
- if ("serverDefinition".equals(tagName)) {
- hasProjectPath = false;
- currentDefinition = new ServerTypeDefinition();
- currentDefinition.setName(attributes.getValue("name"));
- currentDefinition.setWebModules(false);
- if ("true".equals(attributes.getValue("webModules")))
- currentDefinition.setWebModules(true);
- currentDefinition.setEjbModules(false);
- if ("true".equals(attributes.getValue("webModules")))
- currentDefinition.setEjbModules(true);
- currentDefinition.setEarModules(false);
- if ("true".equals(attributes.getValue("earModules")))
- currentDefinition.setEarModules(true);
-
- } else if ("property".equals(tagName)) {
- ServerTypeDefinitionProperty property = new ServerTypeDefinitionProperty();
- property.setId(attributes.getValue("id"));
- property.setLabel(attributes.getValue("label"));
- property.setDefaultValue(attributes.getValue("default"));
- property.setTypeFromStr(attributes.getValue("type"));
- property.setContext(attributes.getValue("context"));
- currentDefinition.getProperties().add(property);
- } else if ("serverClassPath".equals(tagName)) {
- currentClasspath = new ArrayList();
- } else if ("clientClassPath".equals(tagName)) {
- currentClasspath = new ArrayList();
- } else if ("projectClassPath".equals(tagName)) {
- currentClasspath = new ArrayList();
- } else if ("adminToolPath".equals(tagName)) {
- currentClasspath = new ArrayList();
- } else if ("jar".equals(tagName)) {
- currentClasspathItem = new ClasspathItem();
- currentClasspathItem.setTypeStr(attributes.getValue("type"));
- currentClasspath.add(currentClasspathItem);
- } else if ("adminTool".equals(tagName)) {
- inAdminTool = true;
- inEjbModule = false;
- inWebModule = false;
- inEar = false;
- inEjb = false;
- inWar = false;
- currentDefinition.getAdminTool().setDefined(true);
- } else if ("web".equals(tagName)) {
- if (inAdminTool)
- inWar = true;
- } else if ("ejb".equals(tagName)) {
- if (inAdminTool)
- inEjb = true;
- } else if ("ear".equals(tagName)) {
- if (inAdminTool)
- inEar = true;
- } else if ("webModule".equals(tagName)) {
- if (inAdminTool)
- inWebModule = true;
- } else if ("ejbModule".equals(tagName)) {
- if (inAdminTool)
- inEjbModule = true;
- }
- }
-
- /* (non-Javadoc)
- * @see com.objectlearn.jdt.xml.BuildConfigInterface#getConfigObject()
- */
- public Object getConfigObject() {
- return currentDefinition;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLReader.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLReader.java
deleted file mode 100644
index ad308a5..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLReader.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.xml;
-import java.io.CharArrayReader;
-import java.io.CharArrayWriter;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-
-/**
- * Builds the config objects from their XML definitions
- *
- * @author B. Görkem ERCAN
- */
-public class XMLReader extends DefaultHandler
-{
- private IXMLTagProcessor config = null;
- private CharArrayWriter contents = new CharArrayWriter();
- public XMLReader(IXMLTagProcessor buildConfig)
- {
- super();
- this.config = buildConfig;
- }
-
- /**
- * @see org.xml.sax.ContentHandler#characters(char[], int, int)
- */
- public void characters(char[] ch, int start, int length)
- throws SAXException
- {
- contents.write(ch, start, length);
- }
-
- /**
- * @see org.xml.sax.ContentHandler#endElement(String, String, String)
- */
- public void endElement(String nameSpaceURI, String localName, String qName)
- throws SAXException
- {
- String tagName = ( localName != null && localName.length() > 0) ? localName : qName;
- config.assesTagEnd(tagName, contents.toString());
- }
-
- /**
- * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes)
- */
- public void startElement(
- String nameSpaceURI,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException
- {
- contents.reset();
- String tagName = ( localName != null && localName.length() > 0) ? localName : qName;
- config.assesTagStart(tagName,attributes);
- }
-
- /**
- * Method getConfigObject.
- * @return Object
- */
- public Object getConfigObject()
- {
- return this.config.getConfigObject();
- }
-
- public static ServerTypeDefinition getServerDefinition(String fileName)
- {
- try
- {
- return (ServerTypeDefinition) doParse(fileName, new XMLConfiguration());
- }
- catch (Exception e)
- {
- e.printStackTrace();//J2EEPlugin.log(e);
- return null;
- }
-
- }
-
-
- private static Object doParse(String fileName, IXMLTagProcessor cf)
- throws
- FileNotFoundException,
- IOException, ParserConfigurationException, SAXException
- {
-
- SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();;
- saxParserFactory.setValidating(false);
- javax.xml.parsers.SAXParser parser = saxParserFactory.newSAXParser();
- parser.getXMLReader().setFeature("http://xml.org/sax/features/validation", false);
- ContentHandler contentHandler = new XMLReader(cf);
- parser.getXMLReader().setContentHandler(contentHandler);
- InputSource source = new InputSource(new FileReader(fileName));
- parser.parse(source, new XMLReader(cf));
- return cf.getConfigObject();
- }
-
-// private static Object parseString(String content, IXMLTagProcessor cf)
-// throws
-// FileNotFoundException,
-// IOException, ParserConfigurationException, SAXException
-// {
-// SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();;
-// javax.xml.parsers.SAXParser parser = saxParserFactory.newSAXParser();
-// saxParserFactory.setValidating(false);
-// parser.getXMLReader().setFeature("http://xml.org/sax/features/validation", false);
-// InputSource source = new InputSource(new CharArrayReader(content.toCharArray()));
-// parser.parse(source, new XMLReader(cf));
-// return cf.getConfigObject();
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
deleted file mode 100644
index 3967b2a..0000000
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.internal.xml;
-
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-/**
- * @author Naci Dai
- */
-public class XMLUtils {
-
- ArrayList definitions;
- File sourceDir;
-
- public XMLUtils(URL installUrl)
- {
- String serversPath = installUrl.getPath()+"/servers";
- URI uri;
- try {
- uri = new URI(installUrl.getProtocol(),installUrl.getHost(),serversPath,installUrl.getQuery());
- sourceDir = new File(uri);
- } catch (URISyntaxException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- refresh();
- }
-
-
- public void refresh()
- {
- definitions = scanFiles(sourceDir);
- }
- public void update(ServerTypeDefinition element)
- {
- toFile(element);
- }
-
- public void update()
- {
- Iterator defs = definitions.iterator();
- while (defs.hasNext()) {
- ServerTypeDefinition element = (ServerTypeDefinition) defs.next();
- update(element);
- }
- }
-
- private void toFile(ServerTypeDefinition def)
- {
- try {
- def.getDefinitionFile().renameTo(new File(def.getDefinitionFile().getCanonicalFile()+".bak"));
- } catch (IOException e) {
- }
-
- try {
- FileOutputStream out = new FileOutputStream(def.getDefinitionFile());
- out.write(def.toString().getBytes());
- out.close();
- } catch (FileNotFoundException e) {
- } catch (IOException e) {
- }
- }
- private ArrayList scanFiles(File dir)
- {
- ArrayList all = new ArrayList();
- try {
- if(dir.isDirectory()){
- File[] allServers = dir.listFiles(new FilenameFilter(){
- /* (non-Javadoc)
- * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
- */
- public boolean accept(File dir, String name) {
- if(name.endsWith(".server"))
- return true;
- return false;
- }
-
- });
-
- for (int i = 0; i < allServers.length; i++) {
- File file = allServers[i];
- ServerTypeDefinition def = XMLReader.getServerDefinition(file.getCanonicalPath());
- if(def != null){
- def.setDefinitionFile(file);
- all.add(def);
- }
-
- }
- }
- } catch (IOException e) {
- }
-
- return all;
- }
-
- /**
- * @return ArrayList
- */
- public ArrayList getServerTypeDefinitions() {
- return definitions;
- }
-
- /**
- * @return ArrayList
- */
- public ServerTypeDefinition getServerTypeDefinitionNamed(String name) {
- refresh();
- Iterator defs = getServerTypeDefinitions().iterator();
- while (defs.hasNext()) {
- ServerTypeDefinition elem = (ServerTypeDefinition) defs.next();
- if(name.equals(elem.getName()))
- return elem;
- }
- return null;
- }
-
- /**
- * Sets the definitions.
- * @param definitions The definitions to set
- */
- public void setDefinitions(ArrayList definitions) {
- this.definitions = definitions;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/.classpath b/plugins/org.eclipse.jst.server.generic.modules/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.server.generic.modules/.cvsignore b/plugins/org.eclipse.jst.server.generic.modules/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jst.server.generic.modules/.project b/plugins/org.eclipse.jst.server.generic.modules/.project
deleted file mode 100644
index af14ba8..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.generic.modules/build.properties b/plugins/org.eclipse.jst.server.generic.modules/build.properties
deleted file mode 100644
index 9815251..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.commonmodules.jar = src/
-output.commonmodules.jar = bin/
-bin.includes = plugin.xml,\
- commonmodules.jar
-src.includes = plugin.xml,\
- src/
diff --git a/plugins/org.eclipse.jst.server.generic.modules/plugin.xml b/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
deleted file mode 100644
index 47858aa..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/plugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.server.generic.modules"
- name="J2EE Common Modules Plug-in"
- version="1.0.0"
- provider-name="Eteration.com"
- class="org.eclipse.jst.server.generic.modules.ModulesPlugin">
-
- <runtime>
- <library name="commonmodules.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.jst.server.core"/>
- </requires>
-
- <extension point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- projects="true"
- class="org.eclipse.jst.server.generic.modules.J2eeSpecModuleFactoryDelegate"
- id="org.eclipse.jst.server.generic.modules.j2eeSpecModules">
- <moduleType
- types="j2ee.web,j2ee.ejb,j2ee.ear"
- versions="1.2,1.3,1.4">
- </moduleType>
- </moduleFactory>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.moduleObjectAdapters">
- <moduleObjectAdapter
- id="org.eclipse.jst.server.generic.modules.j2eeSpecModuleObjectAdapter"
- class="org.eclipse.jst.server.generic.modules.J2EESpecModuleObjectAdapter"
- objectClass="org.eclipse.core.resources.IResource"/>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EjbModule.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EjbModule.java
deleted file mode 100644
index e826f1b..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EjbModule.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.modules;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.j2ee.IEJBModule;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleListener;
-import org.eclipse.wst.server.core.resources.IModuleResource;
-
-
-public class EjbModule extends J2EEModule implements IEJBModule {
-
-
- public EjbModule(IFolder moduleFolder) {
- super(moduleFolder);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IEJBModule#getEJBSpecificationVersion()
- */
- public String getEJBSpecificationVersion() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IJ2EEModule#isBinary()
- */
- public boolean isBinary() {
- // TODO Auto-generated method stub
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#members()
- */
- public IModuleResource[] members() throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
-
-
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#addModuleListener(org.eclipse.wst.server.core.model.IModuleListener)
- */
- public void addModuleListener(IModuleListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#removeModuleListener(org.eclipse.wst.server.core.model.IModuleListener)
- */
- public void removeModuleListener(IModuleListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#getChildModules()
- */
- public IModule[] getChildModules() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.IModuleType#getType()
- */
- public String getType() {
- return "j2ee.ejb";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#validate()
- */
- public IStatus validate() {
- try {
- if(Utils.isValidEjbModule(this.getFolder()))
- return new Status(IStatus.OK,ModulesPlugin.ID, 0,"",null);
- } catch (Exception e) {
- Trace.trace("Unale to validate EJB Module", e);
- }
- return new Status(IStatus.ERROR,ModulesPlugin.ID, 0,"",null);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EnterpriseApplication.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EnterpriseApplication.java
deleted file mode 100644
index b129599..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/EnterpriseApplication.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.modules;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.j2ee.IEnterpriseApplication;
-import org.eclipse.jst.server.j2ee.IJ2EEModule;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleListener;
-import org.eclipse.wst.server.core.resources.IModuleResource;
-
-
-public class EnterpriseApplication extends J2EEModule implements IEnterpriseApplication{
-
-
- public EnterpriseApplication(IFolder moduleFolder) {
- super(moduleFolder);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IEnterpriseApplication#getModules()
- */
- public IJ2EEModule[] getModules() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IEnterpriseApplication#getURI(org.eclipse.jst.server.j2ee.IJ2EEModule)
- */
- public String getURI(IJ2EEModule module) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IEnterpriseApplication#containsLooseModules()
- */
- public boolean containsLooseModules() {
- // TODO Auto-generated method stub
- return false;
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#validate()
- */
- public IStatus validate() {
- try {
- if(Utils.isValidEarModule(this.getFolder()))
- return new Status(IStatus.OK,ModulesPlugin.ID, 0,"",null);
- } catch (Exception e) {
- Trace.trace("Unale to validate EAR Module", e);
- }
- return new Status(IStatus.ERROR,ModulesPlugin.ID, 0,"",null);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#members()
- */
- public IModuleResource[] members() throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#addModuleListener(org.eclipse.wst.server.core.model.IModuleListener)
- */
- public void addModuleListener(IModuleListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#removeModuleListener(org.eclipse.wst.server.core.model.IModuleListener)
- */
- public void removeModuleListener(IModuleListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#getChildModules()
- */
- public IModule[] getChildModules() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.IModuleType#getType()
- */
- public String getType() {
- return "j2ee.ear";
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EEModule.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EEModule.java
deleted file mode 100644
index 2d36805..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EEModule.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.modules;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleObject;
-
-
-public abstract class J2EEModule implements IModule {
-
- private IFolder folder;
-
- public J2EEModule(IFolder moduleFolder) {
-
- this.folder = moduleFolder;
- }
-
- public String getJ2EESpecificationVersion() {
- return "1.2";
- }
-
- public IPath getLocation() {
- return this.folder.getLocation();
- }
-
- public IProject getProject() {
- return this.getFolder().getProject();
- }
-
-
- public IFolder getFolder() {
- return folder;
- }
-
- public String getFactoryId() {
- return "org.eclipse.jst.server.generic.modules.j2eeSpecModules";
- }
-
- public String getId() {
- return getName();
- }
-
- public IStatus canPublish() {
- return validate();
- }
-
- public String getName() {
- return getFolder().getName();
- }
-
- public boolean exists() {
- return getFolder().exists();
- }
- public String getVersion() {
- return getJ2EESpecificationVersion();
- }
-
- /**
- * @param resource
- * @return
- */
- public IModuleObject getModuleObject(IResource resource) {
- return null;
- }
-
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EESpecModuleObjectAdapter.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EESpecModuleObjectAdapter.java
deleted file mode 100644
index 835e6b1..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2EESpecModuleObjectAdapter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.modules;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.wst.server.core.model.IModuleObject;
-import org.eclipse.wst.server.core.model.IModuleObjectAdapterDelegate;
-
-public class J2EESpecModuleObjectAdapter implements IModuleObjectAdapterDelegate {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModuleObjectAdapterDelegate#getModuleObject(java.lang.Object)
- */
- public IModuleObject getModuleObject(Object obj) {
- if (!(obj instanceof IResource))
- return null;
- IResource resource = (IResource) obj;
- J2EEModule module = null;
- module = (J2EEModule)J2eeSpecModuleFactoryDelegate.getInstance().getModule(resource);
- if (module == null)
- return null;
-
- return module.getModuleObject(resource);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2eeSpecModuleFactoryDelegate.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2eeSpecModuleFactoryDelegate.java
deleted file mode 100644
index ab4a0e9..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/J2eeSpecModuleFactoryDelegate.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.modules;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleFactoryDelegate;
-import org.eclipse.wst.server.core.model.IModuleFactoryListener;
-
-
-public class J2eeSpecModuleFactoryDelegate implements IModuleFactoryDelegate {
- protected static final List NO_MODULES = new ArrayList(0);
-
- protected static J2eeSpecModuleFactoryDelegate instance;
- protected IWorkspaceRoot root;
-
- public J2eeSpecModuleFactoryDelegate() {
- root = ResourcesPlugin.getWorkspace().getRoot();
- instance = this;
- }
-
- public static J2eeSpecModuleFactoryDelegate getInstance() {
- if (instance == null)
- new J2eeSpecModuleFactoryDelegate();
- return instance;
- }
-
- public IModule getModule(String memento) {
- if (memento == null)
- return null;
- try {
- IPath modulePath = new Path(memento);
- if(!modulePath.isAbsolute())
- return null;
- return getModule(root.getContainerForLocation(modulePath));
- } catch (Exception e) {
- Trace.trace("Could not create module: " + e.getMessage());
- }
- return null;
- }
-
-
- private IModule getModule(IContainer containerForLocation) {
- IModule module=null;
- if (Utils.isValidModule((IFolder)containerForLocation)) {
- try {
- module = createModule((IFolder)containerForLocation);
- } catch (Exception e) {
- Trace.trace("Unable to get module for container,",e);
- }
- }
- return module;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModuleFactoryDelegate#getModules()
- */
- public List getModules() {
- IProject[] projects = root.getProjects();
- if (projects == null)
- return NO_MODULES;
- List list = new ArrayList();
- int size = projects.length;
- for (int i = 0; i < size; i++) {
- this.initModules(projects[i],list);
- }
- return list;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModuleFactoryDelegate#addModuleFactoryListener(org.eclipse.wst.server.core.model.IModuleFactoryListener)
- */
- public void addModuleFactoryListener(IModuleFactoryListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModuleFactoryDelegate#removeModuleFactoryListener(org.eclipse.wst.server.core.model.IModuleFactoryListener)
- */
- public void removeModuleFactoryListener(IModuleFactoryListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- private void initModules(IProject project, List list) {
- try {
- IResource[] res = project.members();
- initModulesIn(res,list);
- } catch (Exception e) {
- Trace.trace(e.getMessage(), e);
- }
- }
- private void initModulesIn(IResource[] res, List list) throws Exception {
- for (int j = 0; j < res.length; j++) {
- if (res[j].getType() != IResource.FOLDER)
- continue;
- IFolder moduleFolder = (IFolder) res[j];
- initModulesIn(moduleFolder,list);
- }
- }
- private void initModulesIn(IFolder moduleFolder, final List list) throws Exception {
- if (Utils.isValidModule(moduleFolder)) {
- IModule module = createModule(moduleFolder);
- if(module != null)
- list.add(module);
- }
-
- moduleFolder.accept(new IResourceVisitor() {
- public boolean visit(IResource resource) throws CoreException {
- if (resource.getType() != IResource.FOLDER)
- return false;
- IResource res[] = ((IFolder )resource).members();
-
- for (int j = 0; j < res.length; j++) {
- if (res[j].getType() != IResource.FOLDER)
- continue;
- IFolder moduleFolder = (IFolder) res[j];
- try {
- initModulesIn(moduleFolder,list);
- } catch (Exception e) {
- Trace.trace("Could not determine modules in folder", e);
- }
- }
-
- return true;
- }
- });
-
- }
- private IModule createModule(IFolder moduleFolder) throws Exception {
-
- IModule module = null;
- if (Utils.isValidWebModule(moduleFolder)) {
- module = new WebModule(moduleFolder);
- } else if (Utils.isValidEjbModule(moduleFolder)) {
- module = new EjbModule(moduleFolder);
- } else if (Utils.isValidEarModule(moduleFolder)) {
- module = new EnterpriseApplication(moduleFolder);
- }
- return module;
- }
-
- /**
- * @param resource
- * @return
- */
- public IModule getModule(IResource resource) {
-
- return null;
- }
-
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/ModulesPlugin.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/ModulesPlugin.java
deleted file mode 100644
index 00e074a..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/ModulesPlugin.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.modules;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ModulesPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static ModulesPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- public final static String ID = "org.eclipse.jst.server.generic.modules";
-
- /**
- * The constructor.
- */
- public ModulesPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.server.generic.modules.ModulesPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static ModulesPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = ModulesPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Trace.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Trace.java
deleted file mode 100644
index 76c57f9..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Trace.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jst.server.generic.modules;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- **********************************************************************/
-
-/**
- * Helper class to route trace output.
- */
-public class Trace {
- public static byte CONFIG = 0;
- public static byte WARNING = 1;
- public static byte SEVERE = 2;
- public static byte FINEST = 3;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(byte level, String s) {
- trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param s java.lang.String
- * @param t java.lang.Throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (!ModulesPlugin.getDefault().isDebugging())
- return;
-
- System.out.println(s);
- if (t != null)
- t.printStackTrace();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(String s) {
- trace(s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param s java.lang.String
- * @param t java.lang.Throwable
- */
- public static void trace(String s, Throwable t) {
- trace(FINEST, s, t);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Utils.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Utils.java
deleted file mode 100644
index e404746..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/Utils.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.modules;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-
-public class Utils {
-
- public static boolean isValidEarModule(IFolder folder) throws Exception {
- String ePath = "/META-INF/application.xml";
- String ePath2 = "/meta-inf/application.xml";
- return (pathExistsIn(folder, ePath) || pathExistsIn(folder, ePath2));
- }
-
- public static boolean isValidEjbModule(IFolder folder) throws Exception {
- String ePath = "/META-INF/ejb-jar.xml";
- String ePath2 = "/meta-inf/ejb-jar.xml";
- String bPath = "/META-INF/beans.xml";
- return (pathExistsIn(folder, ePath) || pathExistsIn(folder, ePath2) || pathExistsIn(
- folder, bPath));
- }
-
- public static boolean isValidModule(IFolder folder) {
- try {
- return (isValidWebModule(folder) || isValidEarModule(folder) || isValidEjbModule(folder));
- } catch (Exception e) {
- return false;
- }
- }
-
- public static boolean isValidWebModule(IFolder folder) throws Exception {
- String wPath = "/WEB-INF/web.xml";
- String wPath2 = "/web-inf/web.xml";
- return (pathExistsIn(folder, wPath) || pathExistsIn(folder, wPath2));
- }
-
- private static boolean pathExistsIn(IFolder folder, String addToPath) {
- IProject project = folder.getProject();
- IPath folderPath = folder.getProjectRelativePath();
- Path contP = new Path(folderPath.toString() + addToPath);
- IResource er = project.findMember(contP);
- return (er != null && er.exists());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/WebModule.java b/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/WebModule.java
deleted file mode 100644
index 8489881..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/src/org/eclipse/jst/server/generic/modules/WebModule.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.modules;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IModuleListener;
-import org.eclipse.wst.server.core.resources.IModuleResource;
-
-
-public class WebModule extends J2EEModule implements IWebModule {
-
- private String servletSpec = null;
- private String jspSpec = null;
-
- public WebModule(IFolder moduleFolder) {
- super(moduleFolder);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IWebModule#getServletSpecificationVersion()
- */
- public String getServletSpecificationVersion() {
-// web-app_2_4.xsd
-// web-app_2_3.dtd
-// else 2.2
- if(servletSpec == null)
- servletSpec = "2.2";
- return servletSpec;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IWebModule#getJSPSpecificationVersion()
- */
- public String getJSPSpecificationVersion() {
-// if servlet 2.4 -> 2.0
-// else servlet 2.3 -> 1.2
-// else 1.1;
- if(servletSpec == null)
- servletSpec = "1.1";
- return jspSpec;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IWebModule#getContextRoot()
- */
- public String getContextRoot() {
- return this.getFolder().getName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IWebModule#isPublishRequired()
- */
- public boolean isPublishRequired() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.j2ee.IJ2EEModule#isBinary()
- */
- public boolean isBinary() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#validate()
- */
- public IStatus validate() {
- try {
- if(Utils.isValidWebModule(this.getFolder()))
- return new Status(IStatus.OK,ModulesPlugin.ID, 0,"",null);
- } catch (Exception e) {
- Trace.trace("Unale to validate Web Module", e);
- }
- return new Status(IStatus.ERROR,ModulesPlugin.ID, 0,"",null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#members()
- */
- public IModuleResource[] members() throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#addModuleListener(org.eclipse.wst.server.core.model.IModuleListener)
- */
- public void addModuleListener(IModuleListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#removeModuleListener(org.eclipse.wst.server.core.model.IModuleListener)
- */
- public void removeModuleListener(IModuleListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IModule#getChildModules()
- */
- public IModule[] getChildModules() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.IModuleType#getType()
- */
- public String getType() {
- return "j2ee.web";
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/.classpath b/plugins/org.eclipse.jst.server.generic.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.server.generic.ui/.cvsignore b/plugins/org.eclipse.jst.server.generic.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jst.server.generic.ui/.project b/plugins/org.eclipse.jst.server.generic.ui/.project
deleted file mode 100644
index af14ba8..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.generic.ui/build.properties b/plugins/org.eclipse.jst.server.generic.ui/build.properties
deleted file mode 100644
index 6b4a2a0..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.genericui.jar = src/
-output.genericui.jar = bin/
-bin.includes = plugin.xml,\
- genericui.jar,\
- icons/,\
- plugin.properties
-src.includes = icons/,\
- plugin.xml,\
- plugin.properties,\
- src/
diff --git a/plugins/org.eclipse.jst.server.generic.ui/icons/obj16/lomboz.gif b/plugins/org.eclipse.jst.server.generic.ui/icons/obj16/lomboz.gif
deleted file mode 100644
index 5b3a198..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/icons/obj16/lomboz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.generic.ui/plugin.properties b/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
deleted file mode 100644
index 958b586..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-pluginName= Generic J2EE Server Plugin UI
-providerName=Eteration.com
-
diff --git a/plugins/org.eclipse.jst.server.generic.ui/plugin.xml b/plugins/org.eclipse.jst.server.generic.ui/plugin.xml
deleted file mode 100644
index 6646b91..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/plugin.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.server.generic.ui"
- name="%pluginName"
- version="1.0.0"
- provider-name="%providerName"
- class="org.eclipse.jst.server.generic.ui.GenericUiPlugin">
-
- <runtime>
- <library name="genericui.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.server.ui"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.jdt.debug.ui"/>
- <import plugin="org.eclipse.jst.server.generic.core"/>
- <import plugin="org.eclipse.wst.server.core" />
- <import plugin="org.eclipse.jst.server.core"/>
- </requires>
-
- <extension
- point="org.eclipse.wst.server.ui.wizardFragments">
- <fragment
- id="org.eclipse.jst.server.generic.runtime"
- typeIds="org.eclipse.jst.server.generic.runtime"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerRuntimeWizardFragment"/>
- </extension>
-
-<!-- <extension
- point="org.eclipse.wst.server.ui.wizardFragments">
- <fragment
- id="org.eclipse.jst.server.generic.server"
- typeIds="org.eclipse.jst.server.generic.configuration"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerWizardFragment"/>
- </extension>-->
- <extension point="org.eclipse.wst.server.ui.editorPages">
- <page
- id="org.eclipse.jst.server.generic.configuration.editor.webmodule"
- order="20"
- name="Lomboz server Edit"
- typeIds="org.eclipse.jst.server.generic.*"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerEditorPartFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.ui.editorPageSections">
- <section
- id="org.eclipse.jst.server.generic.editor.general"
- order="0"
- insertionId="org.eclipse.wst.server.editor.overview.left"
- typeIds="org.eclipse.jst.server.generic.*"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerEditorSectionFactory"/>
- <!-- <section
- id="org.eclipse.jst.server.tomcat.configuration.editor.port"
- order="10"
- insertionId="org.eclipse.wst.server.editor.overview.right"
- typeIds="org.eclipse.jst.server.tomcat.*"
- class="org.eclipse.jst.server.tomcat.ui.internal.editor.ConfigurationPortEditorSectionFactory"/>
- <section
- id="org.eclipse.jst.server.tomcat.configuration.editor.mime"
- order="20"
- insertionId="org.eclipse.wst.server.editor.overview.right"
- typeIds="org.eclipse.jst.server.tomcat.*"
- class="org.eclipse.jst.server.tomcat.ui.internal.editor.ConfigurationMimeEditorSectionFactory"/>
- -->
- </extension>
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- id="org.eclipse.jst.server.generic.image"
- icon="icons/obj16/lomboz.gif"
- typeIds="org.eclipse.jst.server.generic.runtime"/>
- <image
- id="org.eclipse.jst.server.generic.image"
- icon="icons/obj16/lomboz.gif"
- typeIds="org.eclipse.jst.server.generic"/>
- </extension>
- <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- id="org.eclipse.jst.server.generic.image.ui.launchConfigurationTypeImage"
- configTypeID="org.eclipse.jst.server.generic.core.launchConfigurationType"
- icon="icons/obj16/lomboz.gif">
- </launchConfigurationTypeImage>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- id="org.eclipse.jst.server.generic.internal.ui.launchConfigurationTabGroup"
- type="org.eclipse.jst.server.generic.core.launchConfigurationType"
- class="org.eclipse.jst.server.generic.internal.ui.GenericLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- </extension>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java
deleted file mode 100644
index 23b6e10..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.ui;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
-
-
-public class GenericLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup{
- /**
- * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
- */
- public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
- ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[7];
- tabs[0] = new ServerLaunchConfigurationTab(new String[] { "org.eclipse.jst.server.generic" });
- tabs[0].setLaunchConfigurationDialog(dialog);
- tabs[1] = new JavaArgumentsTab();
- tabs[1].setLaunchConfigurationDialog(dialog);
- tabs[2] = new JavaClasspathTab();
- tabs[2].setLaunchConfigurationDialog(dialog);
- tabs[3] = new SourceLookupTab();
- tabs[3].setLaunchConfigurationDialog(dialog);
- tabs[4] = new EnvironmentTab();
- tabs[4].setLaunchConfigurationDialog(dialog);
- tabs[5] = new JavaJRETab();
- tabs[5].setLaunchConfigurationDialog(dialog);
- tabs[6] = new CommonTab();
- tabs[6].setLaunchConfigurationDialog(dialog);
- setTabs(tabs);
- }}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java
deleted file mode 100644
index 9d7d80c..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.ui;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.ui.editor.IServerEditorPartFactoryDelegate;
-
-
-public class GenericServerEditorPartFactory implements
- IServerEditorPartFactoryDelegate {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.editor.IServerEditorPartFactoryDelegate#shouldCreatePage(org.eclipse.wst.server.core.IServer, org.eclipse.wst.server.core.IServerConfiguration)
- */
- public boolean shouldCreatePage(IServer server,
- IServerConfiguration configuration) {
- // TODO Auto-generated method stub
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.editor.IServerEditorPartFactoryDelegate#createPage()
- */
- public IEditorPart createPage() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java
deleted file mode 100644
index f1ba87f..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jst.server.generic.internal.ui;
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.ui.editor.IServerEditorPageSectionFactoryDelegate;
-import org.eclipse.wst.server.ui.editor.IServerEditorSection;
-
-public class GenericServerEditorSectionFactory implements
- IServerEditorPageSectionFactoryDelegate {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.editor.IServerEditorPageSectionFactoryDelegate#shouldCreateSection(org.eclipse.wst.server.core.IServer, org.eclipse.wst.server.core.IServerConfiguration)
- */
- public boolean shouldCreateSection(IServer server,
- IServerConfiguration configuration) {
- // TODO Auto-generated method stub
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.editor.IServerEditorPageSectionFactoryDelegate#createSection()
- */
- public IServerEditorSection createSection() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerRuntimeWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerRuntimeWizardFragment.java
deleted file mode 100644
index 44ac09e..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerRuntimeWizardFragment.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.ui;
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.server.generic.internal.core.GenericServerRuntime;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.server.core.IElement;
-import org.eclipse.wst.server.core.IResourceManager;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ITaskModel;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-
-/**
- * A serverDefinitionType aware wizard for defining runtimes.
- *
- * @author Gorkem Ercan
- */
-public class GenericServerRuntimeWizardFragment extends ServerDefinitionTypeAwareWizardFragment {
-
- private Group selectionBar;
- private Combo fServerCombo;
- private ServerTypeDefinitionGroup fServerPanel;
- private IRuntimeWorkingCopy fRuntimeWC;
-
- /**
- * Constructor
- */
- public GenericServerRuntimeWizardFragment() {
- super();
- }
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.ui.wizard.IWizardFragment#isComplete()
- */
- public boolean isComplete() {
- IRuntimeWorkingCopy runtime = (IRuntimeWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_RUNTIME);
- if (runtime == null)
- return false;
- IStatus status = runtime.validate();
- return (status != null && status.isOK());
- }
-
- public void createContent(Composite parent, IWizardHandle handle) {
- fRuntimeWC=null;
- createSelectionBar(parent);
- createServerDefinitionTypeComposite(parent);
- }
-
-
- private void swapBody()
- {
- String selected = fServerCombo == null ? null : fServerCombo
- .getItem(fServerCombo.getSelectionIndex());
- if (getServerDefinitionId() != null)
- selected = getServerDefinitionId();
- Map properties = null;
- if (getRuntimeWorkingCopy() != null)
- properties = getRuntimeWorkingCopy()
- .getAttribute(
- GenericServerRuntime.SERVER_INSTANCE_PROPERTIES,
- (Map) null);
- ServerTypeDefinition definition = getServerTypeDefinition(selected,
- properties);
-
- fServerPanel.reset(definition,
- ServerTypeDefinitionGroup.CONTEXT_RUNTIME, properties);
- }
- /**
- * @param selected
- */
- private void createServerDefinitionTypeComposite(Composite parent) {
- String selected = fServerCombo==null?null:fServerCombo.getItem(fServerCombo.getSelectionIndex());
- if(getServerDefinitionId()!=null)
- selected=getServerDefinitionId();
- Map properties= null;
- if(getRuntimeWorkingCopy()!=null)
- properties = getRuntimeWorkingCopy().getAttribute(GenericServerRuntime.SERVER_INSTANCE_PROPERTIES,(Map)null);
- ServerTypeDefinition definition = getServerTypeDefinition(selected,properties);
- fServerPanel = new ServerTypeDefinitionGroup(definition,ServerTypeDefinitionGroup.CONTEXT_RUNTIME,properties,parent,SWT.NONE);
- }
- private void createSelectionBar(Composite content) {
- selectionBar = new Group(content, SWT.SHADOW_ETCHED_IN);
- selectionBar.setLayout(new GridLayout(2,false));
- selectionBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Label label = new Label(selectionBar, SWT.NONE);
- label.setText("Server types:");
- label.setLayoutData(new GridData());
- fServerCombo = new Combo(selectionBar, SWT.BORDER |SWT.READ_ONLY);
- ServerTypeDefinition[] servers = getAllServerDefinitionTypes();
- for(int i=0; i<servers.length; i++){
- fServerCombo.add(servers[i].getName());
- }
- fServerCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
- if(fServerCombo.getItemCount()>0)
- fServerCombo.select(0);
-
- fServerCombo.addSelectionListener(
- new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- swapBody();
- }
- public void widgetDefaultSelected(SelectionEvent e) {}
- }
- );
- }
-
-
- private String getServerDefinitionId()
- {
- String currentDefinition= null;
- if(getRuntimeWorkingCopy()!=null)
- currentDefinition = getRuntimeWorkingCopy().getAttribute(GenericServerRuntime.SERVER_DEFINITION_ID,"");
- if(currentDefinition!= null && currentDefinition.length()>0)
- {
- return currentDefinition;
- }
- return null;
- }
-
- private void selectServerDefinition()
- {
- String currentDefinition = getServerDefinitionId();
- int selectIndex = 0;
- if(currentDefinition != null)
- {
- selectIndex = fServerCombo.indexOf(currentDefinition);
- if(selectIndex<0)
- selectIndex =0;
- }
- fServerCombo.select(selectIndex);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#enter()
- */
- public void enter() {
- String serverDefinition = getServerDefinitionId();
- if(serverDefinition!=null && serverDefinition.length()>0)
- {
- selectServerDefinition();
- swapBody();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#exit()
- */
- public void exit() {
- String selected = fServerCombo.getItem(fServerCombo.getSelectionIndex());
- Map properties = fServerPanel.getProperties();
- IRuntimeWorkingCopy wc = getRuntimeWorkingCopy();
-
- wc.setAttribute(GenericServerRuntime.SERVER_DEFINITION_ID, selected);
- wc.setAttribute(GenericServerRuntime.SERVER_INSTANCE_PROPERTIES,properties);
- wc.setName(createName());
- fRuntimeWC=null;
- }
- private String createName()
- {
- String selected = fServerCombo.getItem(fServerCombo.getSelectionIndex());
- IRuntimeWorkingCopy wc = getRuntimeWorkingCopy();
- IRuntimeType runtimeType = wc.getRuntimeType();
- String name = selected+" ("+runtimeType.getName()+")";
-
- IResourceManager rm = ServerCore.getResourceManager();
- List list = rm.getRuntimes(runtimeType);
- Iterator iterator = list.iterator();
- int suffix = 1;
- String suffixName=name;
- while(iterator.hasNext())
- {
-
- IElement el = (IElement)iterator.next();
- if(el.getName().equals(name)|| el.getName().equals(suffixName))
- suffix++;
- suffixName= name+" "+suffix;
- }
-
- if(suffix>1)
- return suffixName;
- return name;
- }
-
- private IRuntimeWorkingCopy getRuntimeWorkingCopy()
- {
- if(fRuntimeWC == null)
- fRuntimeWC = (IRuntimeWorkingCopy)getTaskModel().getObject(ITaskModel.TASK_RUNTIME);
- return fRuntimeWC;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java
deleted file mode 100644
index 3d0c6c0..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.internal.ui;
-
-import java.util.Map;
-import org.eclipse.jst.server.generic.internal.core.GenericServerRuntime;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ITaskModel;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-/**
- *
- *
- * @author Gorkem Ercan
- */
-public class GenericServerWizardFragment extends ServerDefinitionTypeAwareWizardFragment
-{
-
- private ServerTypeDefinitionGroup fComposite;
- private boolean flag=false;
- /* (non-Javadoc)
- * @see com.ibm.wtp.server.ui.wizard.IWizardFragment#isComplete()
- */
- public boolean isComplete() {
-// IServerWorkingCopy serverWorkingCopy = (IServerWorkingCopy)getTaskModel().getObject(ITaskModel.TASK_SERVER);
-
- //TODO implement
- return flag;
- }
-
- public void createContent(Composite parent, IWizardHandle handle)
- {
- createBody(parent,handle);
- }
- /**
- *
- */
- private void createBody(Composite parent, IWizardHandle handle)
- {
- IServerWorkingCopy server = (IServerWorkingCopy)getTaskModel().getObject(ITaskModel.TASK_SERVER);
- String ID = server.getRuntime().getAttribute(GenericServerRuntime.SERVER_DEFINITION_ID,(String)null);
- Map runtimeProperties = server.getRuntime().getAttribute(GenericServerRuntime.SERVER_INSTANCE_PROPERTIES,(Map)null);
- ServerTypeDefinition definition = getServerTypeDefinition(ID,runtimeProperties);
- fComposite = new ServerTypeDefinitionGroup(definition,ServerTypeDefinitionGroup.CONTEXT_SERVER, null,parent,SWT.NONE);
- flag=true;
-
- }
-
- public void enter() {
- // TODO Auto-generated method stub
- super.enter();
- }
- public void exit() {
- IServerConfigurationWorkingCopy serverConfigWorkingCopy = (IServerConfigurationWorkingCopy)getTaskModel().getObject(ITaskModel.TASK_SERVER_CONFIGURATION);
- serverConfigWorkingCopy.setAttribute("lomboz",fComposite.getProperties());
-// try {
-// serverWorkingCopy.save(new NullProgressMonitor());
-// } catch (CoreException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerDefinitionTypeAwareWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerDefinitionTypeAwareWizardFragment.java
deleted file mode 100644
index b30f4f9..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerDefinitionTypeAwareWizardFragment.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Created on Oct 19, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.server.generic.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.jst.server.generic.core.CorePlugin;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-
-/**
- *
- *
- * @author Gorkem Ercan
- */
-public abstract class ServerDefinitionTypeAwareWizardFragment extends WizardFragment {
-
- public boolean hasComposite() {
- return true;
- }
-
- public Composite createComposite(Composite parent, IWizardHandle handle) {
-
- Composite container = new Composite(parent, SWT.NONE);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
- GridLayout grid = new GridLayout(1,false);
- container.setLayout(grid);
- createContent(container,handle);
- return container;
- }
-
- public abstract void createContent(Composite parent, IWizardHandle handle);
-
- protected ServerTypeDefinition getServerTypeDefinition(String definitionID, Map properties)
- {
- return CorePlugin.getDefault().getServerTypeDefinitionManager().getServerRuntimeDefinition(definitionID,properties);
- }
-
- protected ServerTypeDefinition[] getAllServerDefinitionTypes()
- {
- return CorePlugin.getDefault().getServerTypeDefinitionManager().getServerTypeDefinitions();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerTypeDefinitionGroup.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerTypeDefinitionGroup.java
deleted file mode 100644
index f52bfab..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerTypeDefinitionGroup.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.eclipse.jst.server.generic.internal.ui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinition;
-import org.eclipse.jst.server.generic.internal.xml.ServerTypeDefinitionProperty;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Renders a ServerTypeDefinion inside a Group.
- *
- * @author Gorkem Ercan
- */
-public class ServerTypeDefinitionGroup
-{
- public static final String CONTEXT_SERVER = ServerTypeDefinitionProperty.CONTEXT_SERVER;
- public static final String CONTEXT_RUNTIME = ServerTypeDefinitionProperty.CONTEXT_RUNTIME;
-
- private ServerTypeDefinition fServerTypeDefinition;
- private List fPropertyControls = new ArrayList();
- private Map fPropertyMap =new HashMap();
- private String fContext="undefined";
- private Group fDefinitionGroup;
-
- /**
- * Construct a composite for the given ServerTypeDefinition
- *
- * @param definition
- * @param initialProperties initial values null means use default
- * @param parent
- * @param style
- */
- public ServerTypeDefinitionGroup(ServerTypeDefinition definition, String context, Map initialProperties, Composite parent, int style)
- {
- initServerTypeDefinition(definition,context,initialProperties);
- createControl(parent);
- }
- private void initProperties(Map initialProperties)
- {
- if(initialProperties!= null)
- this.fPropertyMap=initialProperties;
- else
- fPropertyMap=new HashMap();
- }
- /**
- * Changes the values with the given ones. Renders the UI
- * with the given new values.
- *
- * @param definition
- * @param context
- * @param initialProperties
- */
- public void reset(ServerTypeDefinition definition, String context, Map initialProperties)
- {
- initServerTypeDefinition(definition, context, initialProperties);
- fDefinitionGroup.setText(definition.getName());
- Control[] allControls = fDefinitionGroup.getChildren();
- for(int i= 0; i<allControls.length;i++)
- {
- Control c = allControls[i];
- c.dispose();
- }
- fPropertyControls.clear();
- createPropertyControls(fDefinitionGroup);
- fDefinitionGroup.layout(true);
- }
-
- /**
- * @param definition
- * @param context
- * @param initialProperties
- */
- private void initServerTypeDefinition(ServerTypeDefinition definition, String context, Map initialProperties) {
- fServerTypeDefinition = definition;
- initProperties(initialProperties);
- this.fContext = context;
- }
- /**
- * @param parent
- */
- private void createControl(Composite parent) {
-
- fDefinitionGroup = new Group(parent, SWT.SHADOW_ETCHED_IN);
- fDefinitionGroup.setText(fServerTypeDefinition.getName());
- fDefinitionGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
- fDefinitionGroup.setLayout(new GridLayout(3,false));
- createPropertyControls(fDefinitionGroup);
- }
- /**
- * @param defPanel
- */
- private void createPropertyControls(Composite definitionComposite) {
- List properties = fServerTypeDefinition.getProperties();
- for(int i = 0; i<properties.size(); i++)
- {
- ServerTypeDefinitionProperty property = (ServerTypeDefinitionProperty)properties.get(i);
-// if(this.fContext.equals(property.getContext()))
- createPropertyControl(definitionComposite,property);
- }
-
- }
-
- private void createPropertyControl(Composite parent, ServerTypeDefinitionProperty property)
- {
- switch (property.getType()) {
- case ServerTypeDefinitionProperty.TYPE_DIRECTORY :
- Text path = createLabeledPath(property.getLabel(),getPropertyValue(property),parent);
- path.setData(property);
- fPropertyControls.add(path);
- break;
- case ServerTypeDefinitionProperty.TYPE_FILE :
- Text file = createLabeledFile(property.getLabel(),getPropertyValue(property),parent);
- file.setData(property);
- fPropertyControls.add(file);
- break;
- case ServerTypeDefinitionProperty.TYPE_STRING :
- Text str = createLabeledText(property.getLabel(),getPropertyValue(property),parent);
- str.setData(property);
- fPropertyControls.add(str);
- break;
- case ServerTypeDefinitionProperty.TYPE_BOOLEAN :
- Button bool =createLabeledCheck(property.getLabel(),("true".equals( getPropertyValue(property))), parent);
- bool.setData(property);
- fPropertyControls.add(bool);
- break;
- default :
- Text defaultText= createLabeledText(property.getLabel(),getPropertyValue(property),parent);
- defaultText.setData(property);
- fPropertyControls.add(defaultText);
- break;
- }
- }
- private String getPropertyValue(ServerTypeDefinitionProperty property)
- {
- String value = property.getDefaultValue();
- if(fPropertyMap!=null && fPropertyMap.isEmpty()==false)
- value=(String)fPropertyMap.get(property.getId());
- return value;
- }
- protected Button createLabeledCheck(String title, boolean value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
-
- Button fButton = new Button(defPanel, SWT.CHECK);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- fButton.setLayoutData(gridData);
- fButton.setSelection(value);
- return fButton;
- }
- protected Text createLabeledFile(String title, String value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
-
- final Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 1;
- fText.setLayoutData(gridData);
- fText.setText(value);
-
- Button fButton = new Button(defPanel, SWT.PUSH);
- fButton.setText("...");
- fButton.setLayoutData(new GridData());
- fButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- FileDialog dlg = new FileDialog(fDefinitionGroup.getShell());
- dlg.setFileName(fText.getText());
- String res = dlg.open();
- if (res != null) {
- fText.setText(res);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- });
-
- return fText;
- }
- protected Text createLabeledPath(String title, String value,
- Composite parent) {
- GridData gridData;
- Label label = new Label(parent, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
-
- final Text fText = new Text(parent, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 1;
- fText.setLayoutData(gridData);
- fText.setText(value);
- Button fButton = new Button(parent, SWT.PUSH);
- fButton.setText("...");
- fButton.setLayoutData(new GridData());
- fButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog dlg = new DirectoryDialog(fDefinitionGroup.getShell());
- dlg.setFilterPath(fText.getText());
- String res = dlg.open();
- if (res != null) {
- fText.setText(res);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
-
- });
-
- return fText;
- }
- protected Text createLabeledText(String title, String value,
- Composite defPanel) {
- GridData gridData;
- Label label = new Label(defPanel, SWT.WRAP);
- gridData = new GridData();
- label.setLayoutData(gridData);
- label.setText(title);
-
- Text fText = new Text(defPanel, SWT.SHADOW_IN | SWT.BORDER);
- gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- fText.setLayoutData(gridData);
- fText.setText(value);
- return fText;
- }
- public Map getProperties()
- {
- for(int i=0; i<fPropertyControls.size();i++)
- {
- if(fPropertyControls.get(i)instanceof Button)
- {
- Button button = (Button)fPropertyControls.get(i);
- ServerTypeDefinitionProperty prop = (ServerTypeDefinitionProperty)button.getData();
- fPropertyMap.put(prop.getId(),Boolean.toString(button.getSelection()));
- }
- else
- {
- Text text = (Text)fPropertyControls.get(i);
- ServerTypeDefinitionProperty prop = (ServerTypeDefinitionProperty)text.getData();
- fPropertyMap.put(prop.getId(),text.getText());
- }
- }
- return fPropertyMap;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java
deleted file mode 100644
index e2cc51e..0000000
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.ui;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- *
- * @author Gorkem Ercan
- */
-public class GenericUiPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static GenericUiPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public GenericUiPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.server.generic.ui.GenericUiPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static GenericUiPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = GenericUiPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/.classpath b/plugins/org.eclipse.jst.server.tomcat.core/.classpath
deleted file mode 100644
index df44c2e..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="tomcatcore/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/.cvsignore b/plugins/org.eclipse.jst.server.tomcat.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/.options b/plugins/org.eclipse.jst.server.tomcat.core/.options
deleted file mode 100644
index 92ec6ad..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/.options
+++ /dev/null
@@ -1,4 +0,0 @@
-# Debugging options for the org.eclipse.jst.server.tomcat.core plugin
-
-# Turn on general debugging
-org.eclipse.jst.server.tomcat.core/debug=false
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/.project b/plugins/org.eclipse.jst.server.tomcat.core/.project
deleted file mode 100644
index 0904efd..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.tomcat.core</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.server.core</project>
- <project>org.eclipse.jst.server.core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/build.properties b/plugins/org.eclipse.jst.server.tomcat.core/build.properties
deleted file mode 100644
index 231b340..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.tomcatcore.jar = tomcatcore/
-bin.includes = plugin.xml,\
- *.jar,\
- plugin.properties,\
- tomcatcore.jar,\
- verifyInstall.properties,\
- .options
-jars.compile.order =
-src.includes = schema/,\
- build.properties
-output.tomcatcore.jar = bin/
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.properties b/plugins/org.eclipse.jst.server.tomcat.core/plugin.properties
deleted file mode 100644
index e130fc2..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.properties
+++ /dev/null
@@ -1,154 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Apache Tomcat Support
-providerName=IBM
-
-# --------------- Runtime Types ---------------
-apache=Apache
-runtimeTypeTomcat32Label=Apache Tomcat v3.2
-runtimeTypeTomcat32Description=Apache Tomcat v3.2 supports J2EE 1.2 Web modules.
-runtimeTypeTomcat40Label=Apache Tomcat v4.0
-runtimeTypeTomcat40Description=Apache Tomcat v4.0 supports J2EE 1.2 and 1.3 Web modules.
-runtimeTypeTomcat41Label=Apache Tomcat v4.1
-runtimeTypeTomcat41Description=Apache Tomcat v4.1 supports J2EE 1.2 and 1.3 Web modules.
-runtimeTypeTomcat50Label=Apache Tomcat v5.0
-runtimeTypeTomcat50Description=Apache Tomcat v5.0 supports J2EE 1.2, 1.3, and 1.4 Web modules.
-runtimeTypeTomcat55Label=Apache Tomcat v5.5
-runtimeTypeTomcat55Description=Apache Tomcat v5.5 supports J2EE 1.2, 1.3, and 1.4 Web modules.
-
-# runtime locator
-runtimeLocatorLabel=Tomcat Runtimes
-runtimeLocatorDescription=Search for Apache Tomcat v3.2, v4.0, v4.1, and v5.0 runtimes.
-
-serverLocatorLabel=Tomcat Servers
-serverLocatorDescription=Search for Apache Tomcat v3.2, v4.0, v4.1, and v5.0 servers.
-
-# runtime target
-targetJRE=Tomcat JRE
-target32runtime=Tomcat v3.2 runtime
-target40runtime=Tomcat v4.0 runtime
-target41runtime=Tomcat v4.1 runtime
-target50runtime=Tomcat v5.0 runtime
-
-# --------------- Servers and Configurations ---------------
-tomcat32ServerType=Tomcat v3.2 Server
-tomcat32ServerShortType=Local Server
-tomcat32ServerDescription=Publishes and runs J2EE Web projects and server configurations to a local Tomcat server.
-
-tomcat32ConfigurationType=Tomcat v3.2 Server Configuration
-tomcat32ConfigurationShortType=Server Configuration
-tomcat32ConfigurationDescription=A server configuration for Tomcat version 3.2.
-
-tomcat40ServerType=Tomcat v4.0 Server
-tomcat40ServerShortType=Local Server
-tomcat40ServerDescription=Publishes and runs J2EE Web projects and server configurations to a local Tomcat server.
-
-tomcat40ConfigurationType=Tomcat v4.0 Server Configuration
-tomcat40ConfigurationShortType=Server Configuration
-tomcat40ConfigurationDescription=A server configuration for Tomcat version 4.0.
-
-tomcat41ServerType=Tomcat v4.1 Server
-tomcat41ServerShortType=Local Server
-tomcat41ServerDescription=Publishes and runs J2EE Web projects and server configurations to a local Tomcat server.
-
-tomcat41ConfigurationType=Tomcat v4.1 Server Configuration
-tomcat41ConfigurationShortType=Server Configuration
-tomcat41ConfigurationDescription=A server configuration for Tomcat version 4.1.
-
-tomcat50ServerType=Tomcat v5.0 Server
-tomcat50ServerShortType=Local Server
-tomcat50ServerDescription=Publishes and runs J2EE Web projects and server configurations to a local Tomcat server.
-
-tomcat50ConfigurationType=Tomcat v5.0 Server Configuration
-tomcat50ConfigurationShortType=Server Configuration
-tomcat50ConfigurationDescription=A server configuration for Tomcat version 5.0.
-
-tomcat55ServerType=Tomcat v5.5 Server
-tomcat55ServerShortType=Local Server
-tomcat55ServerDescription=Publishes and runs J2EE Web projects and server configurations to a local Tomcat server.
-
-tomcat55ConfigurationType=Tomcat v5.5 Server Configuration
-tomcat55ConfigurationShortType=Server Configuration
-tomcat55ConfigurationDescription=A server configuration for Tomcat version 5.5.
-
-# --------------- Tasks (progress monitors) ---------------
-savingTask=Saving...
-loadingTask=Loading...
-creatingTask=Creating...
-updatingConfigurationTask=Updating run-time configuration...
-publishTask=Publishing to Tomcat...
-publishConfigurationTask=Publishing the configuration...
-publishTempDirectoryTask=Updating the temp directory...
-publishCopyTask=Copying module {0}...
-publishExpandTask=Expanding module {0}...
-publishProjectTask=Publishing project {0}...
-publisherPublishTask=Publishing {0}...
-publisherDeleteTask=Deleting {0}...
-
-tomcatLaunchConfigurationType=Apache Tomcat
-
-# Editor commands (used in undo/redo menus)
-configurationEditorActionAddMimeMapping=add MIME mapping
-configurationEditorActionAddMimeMappingDescription=Add a MIME mapping
-configurationEditorActionModifyMimeMapping=modify MIME mapping
-configurationEditorActionModifyMimeMappingDescription=Modify the MIME mapping
-configurationEditorActionRemoveMimeMapping=remove MIME mapping
-configurationEditorActionRemoveMimeMappingDescription=Remove a MIME mapping
-configurationEditorActionAddWebModule=add Web module
-configurationEditorActionAddWebModuleDescription=Add a Web module
-configurationEditorActionModifyWebModule=modify Web module
-configurationEditorActionModifyWebModuleDescription=Modify the Web module
-configurationEditorActionRemoveWebModule=remove Web module
-configurationEditorActionRemoveWebModuleDescription=Remove Web module {0}
-configurationEditorActionModifyPort=set port number
-configurationEditorActionModifyPortDescription=Set the port number
-configurationEditorActionEditWebModulePath=edit Web module path
-configurationEditorActionEditWebModuleDescription=Change Web module path from {0} to {1}
-
-# --------------- General ---------------
-startingServer=Starting Tomcat server {0}. Debugging is disabled and breakpoints will be ignored.
-debuggingServer=Starting Tomcat server {0} in debug mode. Breakpoints are enabled.
-profilingServer=Starting Tomcat server {0}. Profiling is enabled and debugging has been disabled.
-errorInvalidConfiguration=Invalid server configuration
-canAddModule=Web module can be added to the server.
-canModifyModules=Web modules can be modified.
-
-# --------------- Errors and Info ---------------
-errorTitle=Tomcat Error
-errorInstallDir=The Tomcat installation directory is not correct. Edit the server and change the installation directory.
-errorJRE=The JRE could not be found. Edit the server and change the JRE location.
-errorPortInUse=Port {0} required by {1} is already in use.
-errorCouldNotLaunch=Tomcat could not be launched successfully.
-errorCouldNotFindDebugPort=Could not find a valid port for debugging.
-errorCouldNotLoadServer=Could not find a valid Tomcat server at the specified location.
-errorCouldNotLoadConfiguration=Could not find a valid Tomcat server configuration at the specified location.
-errorCouldNotSaveServer=Could not save the Tomcat server: {0}.
-errorCouldNotSaveConfiguration=Could not save the Tomcat server configuration: {0}.
-errorPublishConfiguration=Could not publish server configuration: {0}.
-errorWebModulesOnly=Tomcat only supports running J2EE Web modules.
-errorCancelled=Cancelled
-errorSpec32=Tomcat version 3.2 only supports J2EE 1.2 Web modules
-errorSpec40=Tomcat version 4.0 only supports J2EE 1.2 and 1.3 Web modules
-errorSpec41=Tomcat version 4.1 only supports J2EE 1.2 and 1.3 Web modules
-errorSpec50=Tomcat version 5.0 only supports J2EE 1.2 and 1.3 and 1.4 Web modules
-errorSpec55=Tomcat version 5.5 only supports J2EE 1.2 and 1.3 and 1.4 Web modules
-errorInstallDir=The Tomcat installation directory is not correct.
-errorJREDir=The JDK installation directory is not correct.
-errorRuntimeName=Enter a name for the runtime.
-errorDuplicateRuntimeName=Name is already in use.
-
-publishingStarted=Publishing started successfully
-publishingStopped=Publishing ended successfully
-
-infoPublishSuccess=Publishing was successful
-infoDefaultAvailable=A Tomcat server is available.
-
-projectCleanupSuccess=Old project {0} was removed successfully.
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
deleted file mode 100644
index e232912..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin id="org.eclipse.jst.server.tomcat.core"
- name="%pluginName"
- version="3.0.0"
- provider-name="%providerName"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin">
-
- <runtime>
- <library name="tomcatcore.jar">
- <export name="*"/>
- <packages prefixes="org.eclipse.jst.server.tomcat.core"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" />
- <import plugin="org.eclipse.core.resources" />
- <import plugin="org.eclipse.debug.core" />
- <import plugin="org.eclipse.jdt.core" />
- <import plugin="org.eclipse.jdt.debug" />
- <import plugin="org.eclipse.jdt.launching" />
- <import plugin="org.eclipse.wst.server.core" />
- <import plugin="org.eclipse.jst.server.core" />
- </requires>
-
- <extension point="org.eclipse.wst.server.core.runtimeTypes">
- <runtimeType
- id="org.eclipse.jst.server.tomcat.32.runtime"
- name="%runtimeTypeTomcat32Label"
- description="%runtimeTypeTomcat32Description"
- vendor="%apache"
- version="3.2"
- order="50"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntimeWorkingCopy">
- <moduleType
- types="j2ee.web"
- versions="1.2"/>
- </runtimeType>
-
- <runtimeType
- id="org.eclipse.jst.server.tomcat.40.runtime"
- name="%runtimeTypeTomcat40Label"
- description="%runtimeTypeTomcat40Description"
- vendor="%apache"
- version="4.0"
- order="52"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntimeWorkingCopy">
- <moduleType
- types="j2ee.web"
- versions="1.2, 1.3"/>
- </runtimeType>
-
- <runtimeType
- id="org.eclipse.jst.server.tomcat.41.runtime"
- name="%runtimeTypeTomcat41Label"
- description="%runtimeTypeTomcat41Description"
- vendor="%apache"
- version="4.1"
- order="54"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntimeWorkingCopy">
- <moduleType
- types="j2ee.web"
- versions="1.2, 1.3"/>
- </runtimeType>
-
- <runtimeType
- id="org.eclipse.jst.server.tomcat.50.runtime"
- name="%runtimeTypeTomcat50Label"
- description="%runtimeTypeTomcat50Description"
- vendor="%apache"
- version="5.0"
- order="56"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntimeWorkingCopy">
- <moduleType
- types="j2ee.web"
- versions="1.2, 1.3, 1.4"/>
- </runtimeType>
-
- <runtimeType
- id="org.eclipse.jst.server.tomcat.55.runtime"
- name="%runtimeTypeTomcat55Label"
- description="%runtimeTypeTomcat55Description"
- vendor="%apache"
- version="5.5"
- order="58"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntimeWorkingCopy">
- <moduleType
- types="j2ee.web"
- versions="1.2, 1.3, 1.4"/>
- </runtimeType>
-
- </extension>
-
- <extension point="org.eclipse.wst.server.core.runtimeLocators">
- <runtimeLocator
- id="org.eclipse.jst.server.tomcat.runtime.locator"
- name="%runtimeLocatorLabel"
- description="%runtimeLocatorDescription"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntimeLocator"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.runtimeTargetHandlers">
- <runtimeTargetHandler
- id="org.eclipse.jst.server.tomcat.runtimeTarget.v32"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat32RuntimeTargetHandler"/>
- <runtimeTargetHandler
- id="org.eclipse.jst.server.tomcat.runtimeTarget.v40"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat40RuntimeTargetHandler"/>
- <runtimeTargetHandler
- id="org.eclipse.jst.server.tomcat.runtimeTarget.v41"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat41RuntimeTargetHandler"/>
- <runtimeTargetHandler
- id="org.eclipse.jst.server.tomcat.runtimeTarget.v50"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat50RuntimeTargetHandler"/>
- <runtimeTargetHandler
- id="org.eclipse.jst.server.tomcat.runtimeTarget.v55"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.55.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat55RuntimeTargetHandler"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.serverTypes">
- <serverType
- id="org.eclipse.jst.server.tomcat.32"
- name="%tomcat32ServerType"
- description="%tomcat32ServerDescription"
- hosts="localhost"
- runtime="true"
- order="50"
- monitorable="true"
- initialState="stopped"
- configurationTypeId="org.eclipse.jst.server.tomcat.32"
- launchConfigId="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- runtimeTypeId="org.eclipse.jst.server.tomcat.32.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatServer"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatServerWorkingCopy">
- </serverType>
- <serverType
- id="org.eclipse.jst.server.tomcat.40"
- name="%tomcat40ServerType"
- description="%tomcat40ServerDescription"
- hosts="localhost"
- runtime="true"
- order="52"
- monitorable="true"
- initialState="stopped"
- configurationTypeId="org.eclipse.jst.server.tomcat.40"
- launchConfigId="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- runtimeTypeId="org.eclipse.jst.server.tomcat.40.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatServer"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatServerWorkingCopy">
- </serverType>
- <serverType
- id="org.eclipse.jst.server.tomcat.41"
- name="%tomcat41ServerType"
- description="%tomcat41ServerDescription"
- hosts="localhost"
- runtime="true"
- order="54"
- monitorable="true"
- initialState="stopped"
- configurationTypeId="org.eclipse.jst.server.tomcat.41"
- launchConfigId="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- runtimeTypeId="org.eclipse.jst.server.tomcat.41.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatServer"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatServerWorkingCopy">
- </serverType>
- <serverType
- id="org.eclipse.jst.server.tomcat.50"
- name="%tomcat50ServerType"
- description="%tomcat50ServerDescription"
- hosts="localhost"
- runtime="true"
- order="56"
- monitorable="true"
- initialState="stopped"
- configurationTypeId="org.eclipse.jst.server.tomcat.50"
- launchConfigId="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- runtimeTypeId="org.eclipse.jst.server.tomcat.50.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatServer"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatServerWorkingCopy">
- </serverType>
- <serverType
- id="org.eclipse.jst.server.tomcat.55"
- name="%tomcat55ServerType"
- description="%tomcat55ServerDescription"
- hosts="localhost"
- runtime="true"
- order="58"
- monitorable="true"
- initialState="stopped"
- configurationTypeId="org.eclipse.jst.server.tomcat.55"
- launchConfigId="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- runtimeTypeId="org.eclipse.jst.server.tomcat.55.runtime"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatServer"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.TomcatServerWorkingCopy">
- </serverType>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.serverLocators">
- <serverLocator
- id="org.eclipse.jst.server.tomcat.server.locator"
- name="%serverLocatorLabel"
- description="%serverLocatorDescription"
- hosts="local"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatServerLocator"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.serverConfigurationTypes">
- <serverConfigurationType
- id="org.eclipse.jst.server.tomcat.32"
- name="%tomcat32ConfigurationType"
- description="%tomcat32ConfigurationDescription"
- isFolder="true"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat32Configuration"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.Tomcat32ConfigurationWorkingCopy">
- </serverConfigurationType>
- <serverConfigurationType
- id="org.eclipse.jst.server.tomcat.40"
- name="%tomcat40ConfigurationType"
- description="%tomcat40ConfigurationDescription"
- isFolder="true"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat40Configuration"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.Tomcat40ConfigurationWorkingCopy">
- </serverConfigurationType>
- <serverConfigurationType
- id="org.eclipse.jst.server.tomcat.41"
- name="%tomcat41ConfigurationType"
- description="%tomcat41ConfigurationDescription"
- isFolder="true"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat41Configuration"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.Tomcat41ConfigurationWorkingCopy">
- </serverConfigurationType>
- <serverConfigurationType
- id="org.eclipse.jst.server.tomcat.50"
- name="%tomcat50ConfigurationType"
- description="%tomcat50ConfigurationDescription"
- isFolder="true"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat50Configuration"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.Tomcat50ConfigurationWorkingCopy">
- </serverConfigurationType>
- <serverConfigurationType
- id="org.eclipse.jst.server.tomcat.55"
- name="%tomcat55ConfigurationType"
- description="%tomcat55ConfigurationDescription"
- isFolder="true"
- class="org.eclipse.jst.server.tomcat.core.internal.Tomcat55Configuration"
- workingCopyClass="org.eclipse.jst.server.tomcat.core.internal.Tomcat55ConfigurationWorkingCopy">
- </serverConfigurationType>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.launchableAdapters">
- <launchableAdapter
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatLaunchableAdapterDelegate"
- id="org.eclipse.jst.server.tomcat.web"/>
- </extension>
-
- <extension point="org.eclipse.debug.core.sourcePathComputers">
- <sourcePathComputer
- id="org.eclipse.jst.server.tomcat.core.sourcePathComputer"
- class="org.eclipse.jst.server.tomcat.core.internal.TomcatSourcePathComputerDelegate"/>
- </extension>
-
- <extension point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- id="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- name="%tomcatLaunchConfigurationType"
- delegate="org.eclipse.jst.server.tomcat.core.internal.TomcatLaunchConfigurationDelegate"
- modes="run, debug"
- sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.eclipse.jst.server.tomcat.core.sourcePathComputer"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/IMimeMapping.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/IMimeMapping.java
deleted file mode 100644
index e269443..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/IMimeMapping.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- *
- */
-public interface IMimeMapping {
- /**
- * Returns the extension.
- * @return java.lang.String
- */
- public String getExtension();
-
- /**
- * Returns the mime type.
- * @return java.lang.String
- */
- public String getMimeType();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatConfiguration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatConfiguration.java
deleted file mode 100644
index e0a2b4b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatConfiguration.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.wst.server.core.model.IServerConfigurationDelegate;
-/**
- *
- */
-public interface ITomcatConfiguration extends IServerConfigurationDelegate {
- /**
- * Returns a list of mime mappings.
- * @return java.util.List
- */
- public List getMimeMappings();
-
- /**
- * Returns a list of ServerPorts that this configuration uses.
- *
- * @return java.util.List
- */
- public List getServerPorts();
-
- /**
- * Return a list of the web modules in this server.
- * @return java.util.List
- */
- public List getWebModules();
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatConfigurationWorkingCopy.java
deleted file mode 100644
index 3028367..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatConfigurationWorkingCopy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.wst.server.core.model.IServerConfigurationWorkingCopyDelegate;
-
-public interface ITomcatConfigurationWorkingCopy extends ITomcatConfiguration, IServerConfigurationWorkingCopyDelegate {
- /**
- * Add a web module.
- *
- * @param index int
- * @param module org.eclipse.jst.server.tomcat.WebModule
- */
- public void addWebModule(int index, ITomcatWebModule module);
-
- /**
- * Change a web module.
- * @param index int
- * @param docBase java.lang.String
- * @param path java.lang.String
- * @param reloadable boolean
- */
- public void modifyWebModule(int index, String docBase, String path, boolean reloadable);
-
- /**
- * Removes a web module.
- * @param index int
- */
- public void removeWebModule(int index);
-
- /**
- * Adds a mime mapping.
- *
- * @param index int
- * @param map MimeMapping
- */
- public void addMimeMapping(int index, IMimeMapping map);
-
- /**
- * Change a mime mapping.
- * @param index int
- * @param map MimeMapping
- */
- public void modifyMimeMapping(int index, IMimeMapping map);
-
- /**
- * Modify the port with the given id.
- *
- * @param id java.lang.String
- * @param port int
- */
- public void modifyServerPort(String id, int port);
-
- /**
- * Removes a mime mapping.
- * @param index int
- */
- public void removeMimeMapping(int index);
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatRuntime.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatRuntime.java
deleted file mode 100644
index 203ef25..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatRuntime.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.jdt.launching.IVMInstall;
-
-import org.eclipse.wst.server.core.model.IRuntimeDelegate;
-/**
- *
- */
-public interface ITomcatRuntime extends IRuntimeDelegate {
- public String getVMInstallTypeId();
-
- public String getVMInstallId();
-
- public IVMInstall getVMInstall();
-
- public List getRuntimeClasspath();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatRuntimeWorkingCopy.java
deleted file mode 100644
index 2be3301..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatRuntimeWorkingCopy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.wst.server.core.model.IRuntimeWorkingCopyDelegate;
-/**
- *
- */
-public interface ITomcatRuntimeWorkingCopy extends ITomcatRuntime, IRuntimeWorkingCopyDelegate {
- public void setVMInstall(String typeId, String id);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatServer.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatServer.java
deleted file mode 100644
index d22ca1c..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatServer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IProcess;
-
-import org.eclipse.wst.server.core.model.IServerDelegate;
-import org.eclipse.wst.server.core.model.IURLProvider;
-/**
- *
- */
-public interface ITomcatServer extends IServerDelegate, IURLProvider {
- public static final String PROPERTY_SECURE = "secure";
- public static final String PROPERTY_DEBUG = "debug";
- public static final String PROPERTY_TEST_ENVIRONMENT = "testEnvironment";
-
- /**
- * Returns true if the process is set to run in debug mode.
- * This feature only works with Tomcat v4.0.
- *
- * @return boolean
- */
- public boolean isDebug();
-
- /**
- * Returns true if the process is set to run in secure mode.
- *
- * @return boolean
- */
- public boolean isSecure();
-
- /**
- * Returns true if this is a test (run code out of the workbench) environment server.
- *
- * @return boolean
- */
- public boolean isTestEnvironment();
-
- /**
- * Returns the main class that is used to launch the Tomcat server.
- *
- * @return
- */
- public String getRuntimeClass();
-
- /**
- * Set the process that is monitored for Tomcat startup and shutdown.
- * Warning: Do not call this method unless you know what you're doing;
- * it should only be used in rare cases.
- *
- * @param newProcess
- */
- public void setProcess(IProcess newProcess);
-
- /**
- * Setup for starting the server.
- *
- * @param launch ILaunch
- * @param launchMode String
- * @param monitor IProgressMonitor
- */
- public void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatServerWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatServerWorkingCopy.java
deleted file mode 100644
index 2d54aa4..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatServerWorkingCopy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.wst.server.core.model.IServerWorkingCopyDelegate;
-/**
- *
- */
-public interface ITomcatServerWorkingCopy extends ITomcatServer, IServerWorkingCopyDelegate {
- /**
- * Sets this process to debug mode. This feature only works
- * with Tomcat v4.0 and above.
- *
- * @param b boolean
- */
- public void setDebug(boolean b);
-
- /**
- * Sets this process to secure mode.
- *
- * @param b boolean
- */
- public void setSecure(boolean b);
-
- /**
- * Sets this server to test environment mode.
- *
- * @param b boolean
- */
- public void setTestEnvironment(boolean b);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatWebModule.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatWebModule.java
deleted file mode 100644
index 5edf606..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/ITomcatWebModule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- *
- */
-public interface ITomcatWebModule {
- /**
- * Get the document base.
- *
- * @return java.lang.String
- */
- public String getDocumentBase();
-
- /**
- * Return the path. (context root)
- *
- * @return java.lang.String
- */
- public String getPath();
-
- /**
- * Return the memento.
- *
- * @return java.lang.String
- */
- public String getMemento();
-
- /**
- * Return true if the web module is auto-reloadable.
- *
- * @return java.lang.String
- */
- public boolean isReloadable();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/WebModule.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/WebModule.java
deleted file mode 100644
index 8bb2640..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/WebModule.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jst.server.tomcat.core;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * A Web module.
- */
-public class WebModule implements ITomcatWebModule {
- private String docBase;
- private String path;
- private String memento;
- private boolean reloadable;
-
- /**
- * WebModule constructor comment.
- */
- public WebModule(String path, String docBase, String memento, boolean reloadable) {
- super();
- this.path = path;
- this.docBase = docBase;
- this.memento = memento;
- this.reloadable = reloadable;
- }
-
- /**
- * Get the document base.
- *
- * @return java.lang.String
- */
- public String getDocumentBase() {
- return docBase;
- }
-
- /**
- * Return the path. (context root)
- *
- * @return java.lang.String
- */
- public String getPath() {
- return path;
- }
-
- /**
- * Return the memento.
- *
- * @return java.lang.String
- */
- public String getMemento() {
- return memento;
- }
-
- /**
- * Return true if the web module is auto-reloadable.
- *
- * @return java.lang.String
- */
- public boolean isReloadable() {
- return reloadable;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatVersionHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatVersionHandler.java
deleted file mode 100644
index caddc6f..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatVersionHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.server.j2ee.IWebModule;
-
-/**
- *
- */
-public interface ITomcatVersionHandler {
- public boolean verifyInstallPath(IPath installPath);
-
- public String getRuntimeClass();
-
- public List getRuntimeClasspath(IPath installPath);
-
- public String[] getRuntimeProgramArguments(IPath configPath, boolean debug, boolean starting);
-
- public String[] getRuntimeVMArguments(IPath installPath, IPath configPath, boolean isSecure);
-
- /**
- * Returns true if the given project is supported by this
- * server, and false otherwise.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return boolean
- */
- public IStatus canAddModule(IWebModule module);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/MimeMapping.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/MimeMapping.java
deleted file mode 100644
index 6954b41..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/MimeMapping.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.IMimeMapping;
-/**
- * A mime mapping.
- */
-public class MimeMapping implements IMimeMapping {
- private String extension;
- private String mimeType;
-
- /**
- * MimeMapping constructor comment.
- */
- public MimeMapping(String extension, String mimeType) {
- super();
- this.extension = extension;
- this.mimeType = mimeType;
- }
-
- /**
- * Returns the extension.
- * @return java.lang.String
- */
- public String getExtension() {
- return extension;
- }
-
- /**
- * Returns the mime type.
- * @return java.lang.String
- */
- public String getMimeType() {
- return mimeType;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java
deleted file mode 100644
index 89802ae..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.FileNotFoundException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.eclipse.debug.core.ILaunchManager;
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerState;
-/**
- * Thread used to ping server to test when it is started.
- */
-public class PingThread extends Thread {
- // delay before pinging starts
- private static final int PING_DELAY = 2000;
-
- // delay between pings
- private static final int PING_INTERVAL = 250;
-
- // maximum number of pings before giving up
- private static final int MAX_PINGS = 56; // total: 16 seconds
-
- private boolean stop = false;
- private String mode;
- private String url = "";
- private TomcatServer serverType;
- private IServerState control;
-
- public PingThread(TomcatServer serverType, IServerState control, String url, String mode) { super();
- this.control = control;
- this.url = url;
- this.mode = mode;
- this.serverType = serverType;
- setDaemon(true);
- }
-
- /**
- * Ping the server until it is started. Then set the server
- * state to SERVER_STARTED.
- */
- public void run() {
- int count = 0;
- try {
- sleep(PING_DELAY);
- } catch (Exception e) { }
- while (!stop) {
- try {
- if (count == MAX_PINGS) {
- serverType.stop();
- stop = true;
- break;
- }
- Trace.trace(Trace.FINEST, "Ping: pinging");
- URL pingUrl = new URL(url);
- URLConnection conn = pingUrl.openConnection();
- ((HttpURLConnection)conn).getResponseCode();
- count++;
-
- // ping worked - server is up
- if (!stop) {
- Trace.trace(Trace.FINEST, "Ping: success");
- Thread.sleep(200);
- if (ILaunchManager.DEBUG_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_DEBUG);
- else if (ILaunchManager.PROFILE_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_PROFILE);
- else
- control.setServerState(IServer.SERVER_STARTED);
- }
- stop = true;
- } catch (FileNotFoundException fe) {
- try { Thread.sleep(200); } catch (Exception e) { }
- if (ILaunchManager.DEBUG_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_DEBUG);
- else if (ILaunchManager.PROFILE_MODE.equals(mode))
- control.setServerState(IServer.SERVER_STARTED_PROFILE);
- else
- control.setServerState(IServer.SERVER_STARTED);
- stop = true;
- } catch (Exception e) {
- Trace.trace(Trace.FINEST, "Ping: failed");
- // pinging failed
- if (!stop) {
- try {
- sleep(PING_INTERVAL);
- } catch (InterruptedException e2) { }
- }
- }
- }
- }
-
- /**
- * Tell the pinging to stop.
- */
- public void stopPinging() {
- //Trace.trace("Ping: stopping");
- stop = true;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java
deleted file mode 100644
index 2da373b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java
+++ /dev/null
@@ -1,452 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.Factory;
-import org.eclipse.jst.server.tomcat.core.internal.xml.XMLUtil;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.ContextManager;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.Parameter;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.Server;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-import org.eclipse.wst.server.core.util.ServerPort;
-/**
- * Tomcat v3.2 server configuration.
- */
-public class Tomcat32Configuration extends TomcatConfiguration {
- public static final String ID = "org.eclipse.tomcat.configuration.32";
-
- protected static final String HTTP_HANDLER = "org.apache.tomcat.service.http.HttpConnectionHandler";
- protected static final String APACHE_HANDLER = "org.apache.tomcat.service.connector.Ajp12ConnectionHandler";
- protected static final String SSL_SOCKET_FACTORY = "org.apache.tomcat.net.SSLSocketFactory";
-
- protected Server server;
- protected Factory serverFactory;
- protected boolean isServerDirty;
-
- protected WebAppDocument webAppDocument;
-
- protected Document tomcatUsersDocument;
-
- protected String policyFile;
-
- /**
- * Tomcat32Configuration constructor comment.
- */
- public Tomcat32Configuration() {
- super();
- }
-
- /**
- * Return the root of the docbase parameter.
- *
- * @return java.lang.String
- */
- protected String getDocBaseRoot() {
- return "";
- }
-
- /**
- * Returns the main server port.
- * @return TomcatServerPort
- */
- public IServerPort getMainPort() {
- Iterator iterator = getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort port = (IServerPort) iterator.next();
- if (port.getName().equals("HTTP Connector"))
- return port;
- }
- return null;
- }
-
- /**
- * Returns the mime mappings.
- * @return java.util.List
- */
- public List getMimeMappings() {
- if (webAppDocument == null)
- return new ArrayList(0);
-
- return webAppDocument.getMimeMappings();
- }
-
- /**
- * Returns the prefix that is used in front of the
- * web module path property. (e.g. "webapps")
- *
- * @return java.lang.String
- */
- public String getPathPrefix() {
- return "webapps";
- }
-
- /**
- * Return the docBase of the ROOT web module.
- *
- * @return java.lang.String
- */
- protected String getROOTModuleDocBase() {
- return "webapps/ROOT";
- }
-
- /**
- * Returns the server object (root of server.xml).
- * @return org.eclipse.jst.server.tomcat.internal.xml.server32.Server
- */
- public Server getServer() {
- return server;
- }
-
- /**
- * Returns a list of ServerPorts that this configuration uses.
- *
- * @return java.util.List
- */
- public List getServerPorts() {
- List ports = new ArrayList();
-
- try {
- int count = server.getContextManager().getConnectorCount();
- for (int i = 0; i < count; i++) {
- Connector connector = server.getContextManager().getConnector(i);
- int paramCount = connector.getParameterCount();
- String handler = null;
- String name = "unknown";
- String socketFactory = null;
- String protocol = "TCPIP";
- boolean advanced = true;
- String[] contentTypes = null;
- int port = -1;
- for (int j = 0; j < paramCount; j++) {
- Parameter p = connector.getParameter(j);
- if ("port".equals(p.getName())) {
- try {
- port = Integer.parseInt(p.getValue());
- } catch (Exception e) {
- // ignore
- }
- } else if ("handler".equals(p.getName()))
- handler = p.getValue();
- else if ("socketFactory".equals(p.getName()))
- socketFactory = p.getValue();
- }
- if (HTTP_HANDLER.equals(handler)) {
- protocol = "HTTP";
- contentTypes = new String[] { "web", "webservices" };
- if (SSL_SOCKET_FACTORY.equals(socketFactory)) {
- protocol = "SSL";
- name = "SSL Connector";
- } else {
- name = "HTTP Connector";
- advanced = false;
- }
- } else if (APACHE_HANDLER.equals(handler))
- name = "Apache Connector";
- if (handler != null)
- ports.add(new ServerPort(i + "", name, port, protocol, contentTypes, advanced));
- }
- } catch (Exception e) {
- Trace.trace("Error getting server ports", e);
- }
-
- return ports;
- }
-
- /**
- * Returns the tomcat-users.xml document.
- *
- * @return org.w3c.dom.Document
- */
- public Document getTomcatUsersDocument() {
- return tomcatUsersDocument;
- }
-
- /**
- * Return a list of the web modules in this server.
- * @return java.util.List
- */
- public List getWebModules() {
- List list = new ArrayList();
-
- try {
- ContextManager contextManager = server.getContextManager();
-
- int size = contextManager.getContextCount();
- for (int i = 0; i < size; i++) {
- Context context = contextManager.getContext(i);
- String reload = context.getReloadable();
- if (reload == null)
- reload = "false";
- WebModule module = new WebModule(context.getPath(),
- context.getDocBase(), context.getSource(),
- reload.equalsIgnoreCase("true") ? true : false);
- list.add(module);
- }
- } catch (Exception e) {
- Trace.trace("Error getting project refs", e);
- }
-
- return list;
- }
-
- /**
- * Load a Tomcat configuration from the given directory.
- * @param dir
- * @return org.eclipse.jst.server.tomcat.internal.Tomcat32Configuration
- */
- public void load(IPath path, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 5);
-
- // check for tomcat.policy to verify that this is a v3.2 config
- InputStream in = new FileInputStream(path.append("tomcat.policy").toFile());
- in.read();
- in.close();
- monitor.worked(1);
-
- // create server.xml
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server32");
- server = (Server) serverFactory.loadDocument(new FileInputStream(path.append("server.xml").toFile()));
- monitor.worked(1);
-
- webAppDocument = new WebAppDocument(path.append("web.xml"));
- monitor.worked(1);
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(new FileInputStream(path.append("tomcat-users.xml").toFile())));
- monitor.worked(1);
-
- // load policy file
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(new FileInputStream(path.append("tomcat.policy").toFile())));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- br.close();
- } catch (Exception e) {
- Trace.trace("Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(1);
-
- if (monitor.isCanceled())
- return;
-
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not load Tomcat v3.2 configuration from " + path.toOSString() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Reload a Tomcat configuration from the given resource.
- *
- * @param resource
- * @return org.eclipse.jst.server.tomcat.core.Tomcat32Configuration
- */
- public void load(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 800);
-
- // check for tomcat.policy to verify that this is a v3.2 config
- IFile file = folder.getFile("tomcat.policy");
- if (!file.exists())
- throw new CoreException(new Status(IStatus.WARNING, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), null));
-
- // load server.xml
- file = folder.getFile("server.xml");
- InputStream in = file.getContents();
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server32");
- server = (Server) serverFactory.loadDocument(in);
- monitor.worked(200);
-
- // load web.xml
- file = folder.getFile("web.xml");
- webAppDocument = new WebAppDocument(file);
- monitor.worked(200);
-
- // load tomcat-users.xml
- file = folder.getFile("tomcat-users.xml");
- in = file.getContents();
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(in));
- monitor.worked(200);
-
- // load tomcat.policy
- file = folder.getFile("tomcat.policy");
- in = file.getContents();
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(in));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- br.close();
- } catch (Exception e) {
- Trace.trace("Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(200);
-
- if (monitor.isCanceled())
- throw new Exception("Cancelled");
-
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not reload Tomcat v3.2 configuration from: " + folder.getFullPath() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Save the information held by this object to the given directory.
- * @param dir
- * @param forceDirty if true, the files will be saved, regardless
- * of whether they have been modified
- * @param org.eclipse.core.runtime.IProgressMonitor monitor
- * @throws java.io.IOException
- */
- protected void save(IPath path, boolean forceDirty, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 5);
-
- // make sure directory exists
- if (!path.toFile().exists()) {
- forceDirty = true;
- path.toFile().mkdir();
- }
- monitor.worked(1);
-
- // save files
- if (forceDirty || isServerDirty)
- serverFactory.save(path.append("server.xml").toOSString());
- monitor.worked(1);
-
- webAppDocument.save(path.append("web.xml").toOSString(), forceDirty);
- monitor.worked(1);
-
- if (forceDirty)
- XMLUtil.save(path.append("tomcat-users.xml").toOSString(), tomcatUsersDocument);
- monitor.worked(1);
-
- if (forceDirty) {
- BufferedWriter bw = new BufferedWriter(new FileWriter(path.append("tomcat.policy").toFile()));
- bw.write(policyFile);
- bw.close();
- }
- monitor.worked(1);
- isServerDirty = false;
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v3.2 configuration to " + path, e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- public void save(IPath path, IProgressMonitor monitor) throws CoreException {
- save(path, true, monitor);
- }
-
- /**
- * Save the information held by this object to the given directory.
- * @param dir
- * @param forceDirty if true, the files will be saved, regardless
- * of whether they have been modified
- * @param org.eclipse.core.runtime.IProgressMonitor monitor
- * @throws java.io.IOException
- */
- public void save(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 900);
-
- if (!folder.exists())
- folder.create(true, true, ProgressUtil.getSubMonitorFor(monitor, 100));
- else
- monitor.worked(100);
-
- // save server.xml
- byte[] data = serverFactory.getContents();
- InputStream in = new ByteArrayInputStream(data);
- IFile file = folder.getFile("server.xml");
- if (file.exists()) {
- if (isServerDirty)
- file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- monitor.worked(200);
- } else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save web.xml
- file = folder.getFile("web.xml");
- webAppDocument.save(file, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save tomcat-users.xml
- data = XMLUtil.getContents(tomcatUsersDocument);
- in = new ByteArrayInputStream(data);
- file = folder.getFile("tomcat-users.xml");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save tomcat.policy
- in = new ByteArrayInputStream(policyFile.getBytes());
- file = folder.getFile("tomcat.policy");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v3.2 configuration to " + folder.getFullPath(), e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32ConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32ConfigurationWorkingCopy.java
deleted file mode 100644
index 823ff60..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32ConfigurationWorkingCopy.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.IMimeMapping;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.ITomcatWebModule;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.ContextManager;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server32.Parameter;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-/**
- * Tomcat v3.2 server configuration.
- */
-public class Tomcat32ConfigurationWorkingCopy extends Tomcat32Configuration implements ITomcatConfigurationWorkingCopy {
- protected IServerConfigurationWorkingCopy wc;
-
- /**
- * Tomcat32Configuration constructor comment.
- */
- public Tomcat32ConfigurationWorkingCopy() {
- super();
- }
-
- public void initialize(IServerConfigurationWorkingCopy wc2) {
- this.wc = wc2;
- }
-
- public void setDefaults() { }
-
- public void handleSave(byte id, IProgressMonitor monitor) { }
-
- /**
- * Adds a mime mapping.
- * @param map MimeMapping
- */
- public void addMimeMapping(int index, IMimeMapping map) {
- webAppDocument.addMimeMapping(index, map);
- firePropertyChangeEvent(ADD_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Add a web module.
- * @param module org.eclipse.jst.server.tomcat.WebModule
- */
- public void addWebModule(int index, ITomcatWebModule module) {
- try {
- ContextManager contextManager = server.getContextManager();
- Context context = (Context) contextManager.createElement(index, "Context");
-
- context.setPath(module.getPath());
- context.setDocBase(module.getDocumentBase());
- context.setReloadable(module.isReloadable() ? "true" : "false");
- if (module.getMemento() != null && module.getMemento().length() > 0)
- context.setSource(module.getMemento());
- isServerDirty = true;
- firePropertyChangeEvent(ADD_WEB_MODULE_PROPERTY, null, module);
- } catch (Exception e) {
- Trace.trace("Error adding web module", e);
- }
- }
-
- /**
- * Localize the web projects in this configuration.
- *
- * @param file java.io.File
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- */
- public void localizeConfiguration(IPath path, TomcatServer serverType, IRuntime runtime, IProgressMonitor monitor) {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100);
-
- Tomcat32Configuration config = new Tomcat32Configuration();
- config.load(path, ProgressUtil.getSubMonitorFor(monitor, 30));
-
- if (monitor.isCanceled())
- return;
-
- if (serverType.isTestEnvironment()) {
- config.server.getContextManager().setHome(runtime.getLocation().toOSString());
- config.isServerDirty = true;
- } else {
- IServerConfigurationWorkingCopy scwc = config.getServerConfiguration().getWorkingCopy();
- ((Tomcat32ConfigurationWorkingCopy) scwc.getDelegate()).localizeWebModules();
- }
-
- monitor.worked(40);
-
- if (monitor.isCanceled())
- return;
-
- config.save(path, false, ProgressUtil.getSubMonitorFor(monitor, 30));
-
- if (!monitor.isCanceled())
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Error localizing configuration", e);
- }
- }
-
- /**
- * Go through all of the web modules and make the document
- * base "local" to the configuration.
- */
- protected void localizeWebModules() {
- List modules = getWebModules();
-
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
- String memento = module.getMemento();
- if (memento != null && memento.length() > 0) {
- // update document base to a relative ref
- String docBase = getPathPrefix() + module.getPath();
- if (docBase.startsWith("/") || docBase.startsWith("\\"))
- docBase = docBase.substring(1);
- modifyWebModule(i, docBase, module.getPath(), module.isReloadable());
- }
- }
- }
-
- /**
- * Change the extension of a mime mapping.
- * @param index int
- * @param newExtension java.lang.String
- */
- public void modifyMimeMapping(int index, IMimeMapping map) {
- webAppDocument.modifyMimeMapping(index, map);
- firePropertyChangeEvent(MODIFY_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Modify the port with the given id.
- *
- * @param id java.lang.String
- * @param port int
- */
- public void modifyServerPort(String id, int port) {
- try {
- int con = Integer.parseInt(id);
- Connector connector = server.getContextManager().getConnector(con);
-
- int size = connector.getParameterCount();
- for (int i = 0; i < size; i++) {
- Parameter p = connector.getParameter(i);
- if ("port".equals(p.getName())) {
- p.setValue(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error modifying server port " + id, e);
- }
- }
-
- /**
- * Change a web module.
- * @param index int
- * @param docBase java.lang.String
- * @param path java.lang.String
- * @param reloadable boolean
- */
- public void modifyWebModule(int index, String docBase, String path, boolean reloadable) {
- try {
- ContextManager contextManager = server.getContextManager();
- Context context = contextManager.getContext(index);
- context.setPath(path);
- context.setDocBase(docBase);
- context.setReloadable(reloadable ? "true" : "false");
- isServerDirty = true;
- WebModule module = new WebModule(path, docBase, null, reloadable);
- firePropertyChangeEvent(MODIFY_WEB_MODULE_PROPERTY, new Integer(index), module);
- } catch (Exception e) {
- Trace.trace("Error modifying web module " + index, e);
- }
- }
-
- /**
- * Removes a mime mapping.
- * @param index int
- */
- public void removeMimeMapping(int index) {
- webAppDocument.removeMimeMapping(index);
- firePropertyChangeEvent(REMOVE_MAPPING_PROPERTY, null, new Integer(index));
- }
-
- /**
- * Removes a web module.
- * @param index int
- */
- public void removeWebModule(int index) {
- try {
- ContextManager contextManager = server.getContextManager();
- contextManager.removeElement("Context", index);
- isServerDirty = true;
- firePropertyChangeEvent(REMOVE_WEB_MODULE_PROPERTY, null, new Integer(index));
- } catch (Exception e) {
- Trace.trace("Error removing web module " + index, e);
- }
- }
-
- public void importFromPath(IPath path, IProgressMonitor monitor) throws CoreException {
- load(path, monitor);
- }
-
- public void importFromRuntime(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
- load(runtime.getLocation().append("conf"), monitor);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Handler.java
deleted file mode 100644
index a2d63f8..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Handler.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.j2ee.IWebModule;
-/**
- *
- */
-public class Tomcat32Handler implements ITomcatVersionHandler {
- public boolean verifyInstallPath(IPath installPath) {
- return TomcatPlugin.verifyInstallPath(installPath, TomcatPlugin.TOMCAT_32);
- }
-
- /**
- * Return the runtime class name.
- *
- * @return java.lang.String
- */
- public String getRuntimeClass() {
- return "org.apache.tomcat.startup.Tomcat";
- }
-
- public List getRuntimeClasspath(IPath installPath) {
- List cp = new ArrayList();
- // add all jars from the Tomcat lib directory
- File libDir = installPath.append("lib").toFile();
- if (libDir.exists()) {
- String[] libs = libDir.list();
- for (int i = 0; i < libs.length; i++) {
- if (libs[i].endsWith("jar")) {
- IPath path = installPath.append("lib").append(libs[i]);
- cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
- }
- }
- }
-
- return cp;
- }
-
- /**
- * Return the program's runtime arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeProgramArguments(IPath configPath, boolean debug, boolean starting) {
- List list = new ArrayList();
- if (configPath != null) {
- list.add("-f");
- list.add("\"" + configPath.append("conf").append("server.xml").toOSString() + "\"");
- }
-
- if (!starting)
- list.add("-stop");
-
- String[] s = new String[list.size()];
- list.toArray(s);
- return s;
- }
-
- /**
- * Return the runtime (VM) arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeVMArguments(IPath installPath, IPath configPath, boolean isSecure) {
- List list = new ArrayList();
- list.add("-Dtomcat.home=\"" + installPath.toOSString() + "\"");
-
- // run in secure mode
- if (isSecure) {
- IPath dir = configPath;
- dir = dir.append("conf").append("tomcat.policy");
- list.add("-Djava.security.manager");
- list.add("-Djava.security.policy=\"" + dir.toOSString() + "\"");
- }
-
- String[] s = new String[list.size()];
- list.toArray(s);
- return s;
- }
-
- /**
- * Returns true if the given project is supported by this
- * server, and false otherwise.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return boolean
- */
- public IStatus canAddModule(IWebModule module) {
- if ("1.2".equals(module.getJ2EESpecificationVersion()))
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec32"), null);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32RuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32RuntimeTargetHandler.java
deleted file mode 100644
index 8559ee0..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32RuntimeTargetHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public class Tomcat32RuntimeTargetHandler extends TomcatRuntimeTargetHandler {
- public String getId() {
- return "org.eclipse.jst.server.tomcat.runtimeTarget.v32";
- }
-
- public String getLabel() {
- return TomcatPlugin.getResource("%target32runtime");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.target.IServerTargetDelegate#getClasspathEntries()
- */
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime) {
- IPath installPath = runtime.getLocation();
-
- if (installPath == null)
- return new IClasspathEntry[0];
-
- IPath path = installPath.append("lib");
- List list = new ArrayList();
- addLibraryEntries(list, path.toFile(), true);
-
- return resolveList(list);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Configuration.java
deleted file mode 100644
index 2072415..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Configuration.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.Factory;
-import org.eclipse.jst.server.tomcat.core.internal.xml.XMLUtil;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Engine;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Host;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Server;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-import org.eclipse.wst.server.core.util.ServerPort;
-/**
- * Tomcat v4.0 server configuration.
- */
-public class Tomcat40Configuration extends TomcatConfiguration {
- protected static final String DEFAULT_SERVICE = "Tomcat-Standalone";
- protected static final String HTTP_CONNECTOR = "org.apache.catalina.connector.http.HttpConnector";
- protected static final String SSL_SOCKET_FACTORY = "org.apache.catalina.net.SSLServerSocketFactory";
- protected static final String TEST_CONNECTOR = "org.apache.catalina.connector.test.HttpConnector";
- protected static final String APACHE_CONNECTOR = "org.apache.catalina.connector.warp.WarpConnector";
-
- protected Server server;
- protected Factory serverFactory;
- protected boolean isServerDirty;
-
- protected WebAppDocument webAppDocument;
-
- protected Document tomcatUsersDocument;
-
- protected String policyFile;
- protected boolean isPolicyDirty;
-
- /**
- * Tomcat40Configuration constructor comment.
- */
- public Tomcat40Configuration() {
- super();
- }
-
- /**
- * Returns the root of the docbase parameter.
- *
- * @return java.lang.String
- */
- protected String getDocBaseRoot() {
- return "webapps/";
- }
-
- /**
- * Return the port number.
- * @return int
- */
- public IServerPort getMainPort() {
- Iterator iterator = getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort port = (IServerPort) iterator.next();
- if (port.getName().equals("HTTP Connector"))
- return port;
- }
- return null;
- }
-
- /**
- * Returns the mime mappings.
- * @return java.util.List
- */
- public List getMimeMappings() {
- return webAppDocument.getMimeMappings();
- }
-
- /**
- * Returns the prefix that is used in front of the
- * web module path property. (e.g. "webapps")
- *
- * @return java.lang.String
- */
- public String getPathPrefix() {
- return "";
- }
-
- /**
- * Return the docBase of the ROOT web module.
- *
- * @return java.lang.String
- */
- protected String getROOTModuleDocBase() {
- return "ROOT";
- }
-
- /**
- * Returns a list of ServerPorts that this configuration uses.
- *
- * @return java.util.List
- */
- public List getServerPorts() {
- List ports = new ArrayList();
-
- // first add server port
- try {
- int port = Integer.parseInt(server.getPort());
- ports.add(new ServerPort("server", "Server port", port, "TCPIP"));
- } catch (Exception e) { }
-
- // add connectors
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- int size2 = service.getConnectorCount();
- for (int j = 0; j < size2; j++) {
- Connector connector = service.getConnector(j);
- String className = connector.getClassName();
- String name = "unknown port";
- String protocol = "TCPIP";
- boolean advanced = true;
- String[] contentTypes = null;
- int port = -1;
- try {
- port = Integer.parseInt(connector.getPort());
- } catch (Exception e) { }
- if (HTTP_CONNECTOR.equals(className)) {
- name = "HTTP Connector";
- protocol = "HTTP";
- contentTypes = new String[] { "web", "webservices" };
- // check for SSL connector
- try {
- Element element = connector.getSubElement("Factory");
- if (SSL_SOCKET_FACTORY.equals(element.getAttribute("className"))) {
- name = "SSL Connector";
- protocol = "SSL";
- }
- } catch (Exception e) { }
- if ("HTTP".equals(protocol))
- advanced = false;
- } else if (APACHE_CONNECTOR.equals(className))
- name = "Apache Connector";
- if (className != null && className.length() > 0)
- ports.add(new ServerPort(i + "/" + j, name, port, protocol, contentTypes, advanced));
- }
- }
- } catch (Exception e) {
- Trace.trace("Error getting server ports", e);
- }
- return ports;
- }
-
- /**
- * Return a list of the web modules in this server.
- * @return java.util.List
- */
- public List getWebModules() {
- List list = new ArrayList();
-
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- int size2 = host.getContextCount();
- for (int j = 0; j < size2; j++) {
- Context context = host.getContext(j);
- String reload = context.getReloadable();
- if (reload == null)
- reload = "false";
- WebModule module = new WebModule(context.getPath(),
- context.getDocBase(), context.getSource(),
- reload.equalsIgnoreCase("true") ? true : false);
- list.add(module);
- }
- }
- }
- } catch (Exception e) {
- Trace.trace("Error getting modules", e);
- }
- return list;
- }
-
- /**
- * @param java.lang.String
- * @return org.eclipse.jst.server.tomcat.internal.Tomcat40Configuration
- */
- public void load(IPath path, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 5);
-
- // check for catalina.policy to verify that this is a v4.0 config
- InputStream in = new FileInputStream(path.append("catalina.policy").toFile());
- in.read();
- in.close();
- monitor.worked(1);
-
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(new FileInputStream(path.append("server.xml").toFile()));
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V40))
- throw new CoreException(null);
- monitor.worked(1);
-
- webAppDocument = new WebAppDocument(path.append("web.xml"));
- monitor.worked(1);
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(new FileInputStream(path.append("tomcat-users.xml").toFile())));
- monitor.worked(1);
-
- // load policy file
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(new FileInputStream(path.append("catalina.policy").toFile())));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(1);
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load Tomcat v4.0 configuration from " + path.toOSString() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Reload the configuration.
- */
- public void load(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 800);
-
- // check for catalina.policy to verify that this is a v4.0 config
- IFile file = folder.getFile("catalina.policy");
- if (!file.exists())
- throw new CoreException(new Status(IStatus.WARNING, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), null));
-
- // load server.xml
- file = folder.getFile("server.xml");
- InputStream in = file.getContents();
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(in);
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V40))
- throw new Exception("Not a Tomcat v4.0 configuration");
- monitor.worked(200);
-
- // load web.xml
- file = folder.getFile("web.xml");
- webAppDocument = new WebAppDocument(file);
- monitor.worked(200);
-
- // load tomcat-users.xml
- file = folder.getFile("tomcat-users.xml");
- in = file.getContents();
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(in));
- monitor.worked(200);
-
- // load catalina.policy
- file = folder.getFile("catalina.policy");
- in = file.getContents();
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(in));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(200);
-
- if (monitor.isCanceled())
- throw new Exception("Cancelled");
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not reload Tomcat v4.0 configuration from: " + folder.getFullPath() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Save to the given directory.
- * @param dir java.io.File
- * @param forceDirty boolean
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- * @exception java.io.IOException
- */
- protected void save(IPath path, boolean forceDirty, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 3);
-
- // make sure directory exists
- if (!path.toFile().exists()) {
- forceDirty = true;
- path.toFile().mkdir();
- }
- monitor.worked(1);
-
- // save files
- if (forceDirty || isServerDirty)
- serverFactory.save(path.append("server.xml").toOSString());
- monitor.worked(1);
-
- //if (forceDirty || isWebAppDirty)
- // webAppFactory.save(dirPath + "web.xml");
- //webAppDocument.save(path.toOSString(), forceDirty || isPolicyDirty);
- webAppDocument.save(path.append("web.xml").toOSString(), forceDirty);
- monitor.worked(1);
-
- if (forceDirty)
- XMLUtil.save(path.append("tomcat-users.xml").toOSString(), tomcatUsersDocument);
- monitor.worked(1);
-
- if (forceDirty || isPolicyDirty) {
- BufferedWriter bw = new BufferedWriter(new FileWriter(path.append("catalina.policy").toFile()));
- bw.write(policyFile);
- bw.close();
- }
- monitor.worked(1);
- isServerDirty = false;
- isPolicyDirty = false;
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v4.0 configuration to " + path, e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- public void save(IPath path, IProgressMonitor monitor) throws CoreException {
- save(path, true, monitor);
- }
-
- /**
- * Save the information held by this object to the given directory.
- *
- * @param dir
- * @param org.eclipse.core.runtime.IProgressMonitor monitor
- * @throws java.io.IOException
- */
- public void save(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 900);
-
- // save server.xml
- byte[] data = serverFactory.getContents();
- InputStream in = new ByteArrayInputStream(data);
- IFile file = folder.getFile("server.xml");
- if (file.exists()) {
- if (isServerDirty)
- file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- monitor.worked(200);
- } else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save web.xml
- webAppDocument.save(folder.getFile("web.xml"), ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save tomcat-users.xml
- data = XMLUtil.getContents(tomcatUsersDocument);
- in = new ByteArrayInputStream(data);
- file = folder.getFile("tomcat-users.xml");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save catalina.policy
- in = new ByteArrayInputStream(policyFile.getBytes());
- file = folder.getFile("catalina.policy");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v4.0 configuration to " + folder.toString(), e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40ConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40ConfigurationWorkingCopy.java
deleted file mode 100644
index 999948a..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40ConfigurationWorkingCopy.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.IMimeMapping;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.ITomcatWebModule;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Engine;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Host;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Service;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-/**
- * Tomcat v4.0 server configuration.
- */
-public class Tomcat40ConfigurationWorkingCopy extends Tomcat40Configuration implements ITomcatConfigurationWorkingCopy {
- protected IServerConfigurationWorkingCopy wc;
-
- /**
- * Tomcat40Configuration constructor comment.
- */
- public Tomcat40ConfigurationWorkingCopy() {
- super();
- }
-
- public void initialize(IServerConfigurationWorkingCopy wc2) {
- this.wc = wc2;
- }
-
- public void setDefaults() { }
-
- public void handleSave(byte id, IProgressMonitor monitor) { }
-
- /**
- * Adds a mime mapping.
- * @param extension java.lang.String
- * @param mimeType java.lang.String
- */
- public void addMimeMapping(int index, IMimeMapping map) {
- webAppDocument.addMimeMapping(index, map);
- firePropertyChangeEvent(ADD_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Add a web module.
- * @param module org.eclipse.jst.server.tomcat.WebModule
- */
- public void addWebModule(int index, ITomcatWebModule module) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = (Context) host.createElement(index, "Context");
- context.setDocBase(module.getDocumentBase());
- context.setPath(module.getPath());
- context.setReloadable(module.isReloadable() ? "true" : "false");
- if (module.getMemento() != null && module.getMemento().length() > 0)
- context.setSource(module.getMemento());
- isServerDirty = true;
- firePropertyChangeEvent(ADD_WEB_MODULE_PROPERTY, null, module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error adding web module " + module.getPath(), e);
- }
- }
-
- /**
- * Localize the web projects in this configuration.
- *
- * @param file java.io.File
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- */
- public void localizeConfiguration(IPath path, TomcatServer server2, IProgressMonitor monitor) {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100);
-
- Tomcat40Configuration config = new Tomcat40Configuration();
- config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (monitor.isCanceled())
- return;
-
- if (!server2.isTestEnvironment()) {
- IServerConfigurationWorkingCopy scwc = config.getServerConfiguration().getWorkingCopy();
- ((Tomcat40ConfigurationWorkingCopy) scwc.getDelegate()).localizeWebModules();
- }
-
- monitor.worked(20);
-
- if (monitor.isCanceled())
- return;
-
- config.save(path, false, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (!monitor.isCanceled())
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Error localizing configuration", e);
- }
- }
-
- /**
- * Go through all of the web modules and make the document
- * base "local" to the configuration.
- */
- protected void localizeWebModules() {
- List modules = getWebModules();
-
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
- String memento = module.getMemento();
- if (memento != null && memento.length() > 0) {
- // update document base to a relative ref
- String docBase = getPathPrefix() + module.getPath();
- if (docBase.startsWith("/") || docBase.startsWith("\\"))
- docBase = docBase.substring(1);
- modifyWebModule(i, docBase, module.getPath(), module.isReloadable());
- }
- }
- }
-
- /**
- * Change the extension of a mime mapping.
- * @param index int
- * @param newExtension java.lang.String
- */
- public void modifyMimeMapping(int index, IMimeMapping map) {
- webAppDocument.modifyMimeMapping(index, map);
- firePropertyChangeEvent(MODIFY_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Modify the port with the given id.
- *
- * @param id java.lang.String
- * @param port int
- */
- public void modifyServerPort(String id, int port) {
- try {
- if ("server".equals(id)) {
- server.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- return;
- }
-
- int i = id.indexOf("/");
- int servNum = Integer.parseInt(id.substring(0, i));
- int connNum = Integer.parseInt(id.substring(i + 1));
-
- Service service = server.getService(servNum);
- Connector connector = service.getConnector(connNum);
- connector.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- } catch (Exception e) {
- Trace.trace("Error modifying server port " + id, e);
- }
- }
- /**
- * Change a web module.
- * @param index int
- * @param docBase java.lang.String
- * @param path java.lang.String
- * @param reloadable boolean
- */
- public void modifyWebModule(int index, String docBase, String path, boolean reloadable) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = host.getContext(index);
- context.setPath(path);
- context.setDocBase(docBase);
- context.setReloadable(reloadable ? "true" : "false");
- isServerDirty = true;
- WebModule module = new WebModule(path, docBase, null, reloadable);
- firePropertyChangeEvent(MODIFY_WEB_MODULE_PROPERTY, new Integer(index), module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error modifying web module " + index, e);
- }
- }
-
- /**
- * Removes a mime mapping.
- * @param index int
- */
- public void removeMimeMapping(int index) {
- webAppDocument.removeMimeMapping(index);
- firePropertyChangeEvent(REMOVE_MAPPING_PROPERTY, null, new Integer(index));
- }
-
- /**
- * Removes a web module.
- * @param index int
- */
- public void removeWebModule(int index) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- host.removeElement("Context", index);
- isServerDirty = true;
- firePropertyChangeEvent(REMOVE_WEB_MODULE_PROPERTY, null, new Integer(index));
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error removing module ref " + index, e);
- }
- }
-
- public void importFromPath(IPath path, IProgressMonitor monitor) throws CoreException {
- load(path, monitor);
- }
-
- public void importFromRuntime(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
- load(runtime.getLocation().append("conf"), monitor);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
deleted file mode 100644
index b69a5b4..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.j2ee.IWebModule;
-/**
- *
- */
-public class Tomcat40Handler implements ITomcatVersionHandler {
- public boolean verifyInstallPath(IPath installPath) {
- if (installPath == null)
- return false;
-
- String s = installPath.lastSegment();
- if (s != null && s.startsWith("jakarta-tomcat-") && !s.startsWith("jakarta-tomcat-4.0"))
- return false;
- return TomcatPlugin.verifyInstallPath(installPath, TomcatPlugin.TOMCAT_40);
- }
-
- /**
- * Return the runtime class name.
- *
- * @return java.lang.String
- */
- public String getRuntimeClass() {
- return "org.apache.catalina.startup.Bootstrap";
- }
-
- public List getRuntimeClasspath(IPath installPath) {
- List cp = new ArrayList();
-
- // 4.0 - add bootstrap.jar from the Tomcat bin directory
- IPath binPath = installPath.append("bin");
- if (binPath.toFile().exists()) {
- IPath path = binPath.append("bootstrap.jar");
- cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
- }
-
- return cp;
- }
-
- /**
- * Return the program's runtime arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeProgramArguments(IPath configPath, boolean debug, boolean starting) {
- List list = new ArrayList();
- if (configPath != null) {
- list.add("-config");
- list.add("\"" + configPath.append("conf").append("server.xml").toOSString() + "\"");
- }
-
- if (debug)
- list.add("-debug");
-
- if (starting)
- list.add("start");
- else
- list.add("stop");
-
- String[] s = new String[list.size()];
- list.toArray(s);
- return s;
- }
-
- /**
- * Return the runtime (VM) arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeVMArguments(IPath installPath, IPath configPath, boolean isSecure) {
- List list = new ArrayList();
- list.add("-Dcatalina.home=\"" + installPath.toOSString() + "\"");
-
- // run in secure mode
- if (isSecure) {
- IPath dir = configPath.append("conf").append("catalina.policy");
- list.add("-Djava.security.manager");
- list.add("-Djava.security.policy=\"" + dir.toOSString() + "\"");
- }
-
- String[] s = new String[list.size()];
- list.toArray(s);
- return s;
- }
-
- /**
- * Returns true if the given project is supported by this
- * server, and false otherwise.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return boolean
- */
- public IStatus canAddModule(IWebModule module) {
- if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()))
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec40"), null);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40RuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40RuntimeTargetHandler.java
deleted file mode 100644
index 5adf0e6..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40RuntimeTargetHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public class Tomcat40RuntimeTargetHandler extends TomcatRuntimeTargetHandler {
- public String getId() {
- return "org.eclipse.jst.server.tomcat.runtimeTarget.v40";
- }
-
- public String getLabel() {
- return TomcatPlugin.getResource("%target40runtime");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.target.IServerTargetDelegate#getClasspathEntries()
- */
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime) {
- IPath installPath = runtime.getLocation();
-
- if (installPath == null)
- return new IClasspathEntry[0];
-
- IPath path = installPath.append("common");
- List list = new ArrayList();
- addLibraryEntries(list, path.append("lib").toFile(), true);
- addLibraryEntries(list, path.append("endorsed").toFile(), true);
- //addLibraryEntry(list, path.append("classes").toFile()); // no longer supported by eclipse
- return resolveList(list);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Configuration.java
deleted file mode 100644
index 5d26f99..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Configuration.java
+++ /dev/null
@@ -1,461 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.Factory;
-import org.eclipse.jst.server.tomcat.core.internal.xml.XMLUtil;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Engine;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Host;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Listener;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Server;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-import org.eclipse.wst.server.core.util.ServerPort;
-/**
- * Tomcat v4.1 server configuration.
- */
-public class Tomcat41Configuration extends TomcatConfiguration {
- protected static final String DEFAULT_SERVICE = "Tomcat-Standalone";
- protected static final String HTTP_CONNECTOR = "org.apache.coyote.tomcat4.CoyoteConnector";
- protected static final String SSL_SOCKET_FACTORY = "org.apache.coyote.tomcat4.CoyoteServerSocketFactory";
- //protected static final String TEST_CONNECTOR = "org.apache.catalina.connector.test.HttpConnector";
- //org.apache.ajp.tomcat4.Ajp13Connector
- protected static final String APACHE_CONNECTOR = "org.apache.catalina.connector.warp.WarpConnector";
-
- protected Server server;
- protected Factory serverFactory;
- protected boolean isServerDirty;
-
- protected WebAppDocument webAppDocument;
-
- protected Document tomcatUsersDocument;
-
- protected String policyFile;
- protected boolean isPolicyDirty;
-
- /**
- * Tomcat41Configuration constructor comment.
- */
- public Tomcat41Configuration() {
- super();
- }
-
- /**
- * Returns the root of the docbase parameter.
- *
- * @return java.lang.String
- */
- protected String getDocBaseRoot() {
- return "webapps/";
- }
-
- /**
- * Return the port number.
- * @return int
- */
- public IServerPort getMainPort() {
- Iterator iterator = getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort port = (IServerPort) iterator.next();
- if (port.getName().equals("HTTP Connector"))
- return port;
- }
- return null;
- }
-
- /**
- * Returns the mime mappings.
- * @return java.util.List
- */
- public List getMimeMappings() {
- return webAppDocument.getMimeMappings();
- }
-
- /**
- * Returns the prefix that is used in front of the
- * web module path property. (e.g. "webapps")
- *
- * @return java.lang.String
- */
- public String getPathPrefix() {
- return "";
- }
-
- /**
- * Return the docBase of the ROOT web module.
- *
- * @return java.lang.String
- */
- protected String getROOTModuleDocBase() {
- return "ROOT";
- }
-
- /**
- * Returns a list of ServerPorts that this configuration uses.
- *
- * @return java.util.List
- */
- public List getServerPorts() {
- List ports = new ArrayList();
-
- // first add server port
- try {
- int port = Integer.parseInt(server.getPort());
- ports.add(new ServerPort("server", "Server port", port, "TCPIP"));
- } catch (Exception e) { }
-
- // add connectors
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- int size2 = service.getConnectorCount();
- for (int j = 0; j < size2; j++) {
- Connector connector = service.getConnector(j);
- String className = connector.getClassName();
- String name = className;
- String protocol = "TCPIP";
- boolean advanced = true;
- String[] contentTypes = null;
- int port = -1;
- try {
- port = Integer.parseInt(connector.getPort());
- } catch (Exception e) { }
- if (HTTP_CONNECTOR.equals(className)) {
- name = "HTTP Connector";
- protocol = "HTTP";
- contentTypes = new String[] { "web", "webservices" };
- // check for SSL connector
- try {
- Element element = connector.getSubElement("Factory");
- if (SSL_SOCKET_FACTORY.equals(element.getAttribute("className"))) {
- name = "SSL Connector";
- protocol = "SSL";
- }
- } catch (Exception e) { }
- if ("HTTP".equals(protocol))
- advanced = false;
- } else if (APACHE_CONNECTOR.equals(className))
- name = "Apache Connector";
- if (className != null && className.length() > 0)
- ports.add(new ServerPort(i + "/" + j, name, port, protocol, contentTypes, advanced));
- }
- }
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error getting server ports", e);
- }
- return ports;
- }
-
- /**
- * Return a list of the web modules in this server.
- * @return java.util.List
- */
- public List getWebModules() {
- List list = new ArrayList();
-
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- int size2 = host.getContextCount();
- for (int j = 0; j < size2; j++) {
- Context context = host.getContext(j);
- String reload = context.getReloadable();
- if (reload == null)
- reload = "false";
- WebModule module = new WebModule(context.getPath(),
- context.getDocBase(), context.getSource(),
- reload.equalsIgnoreCase("true") ? true : false);
- list.add(module);
- }
- }
- }
- } catch (Exception e) {
- Trace.trace("Error getting project refs", e);
- }
- return list;
- }
-
- /**
- *
- * @return org.eclipse.jst.server.tomcat.internal.Tomcat40Configuration
- */
- public void load(IPath path, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 5);
-
- // check for catalina.policy to verify that this is a v4.0 config
- InputStream in = new FileInputStream(path.append("catalina.policy").toFile());
- in.read();
- in.close();
- monitor.worked(1);
-
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(new FileInputStream(path.append("server.xml").toFile()));
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V41))
- throw new CoreException(null);
- monitor.worked(1);
-
- webAppDocument = new WebAppDocument(path.append("web.xml"));
- monitor.worked(1);
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(new FileInputStream(path.append("tomcat-users.xml").toFile())));
- monitor.worked(1);
-
- // load policy file
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(new FileInputStream(path.append("catalina.policy").toFile())));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(1);
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load Tomcat v4.0 configuration from " + path.toOSString() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Reload the configuration.
- */
- public void load(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 800);
-
- // check for catalina.policy to verify that this is a v4.0 config
- IFile file = folder.getFile("catalina.policy");
- if (!file.exists())
- throw new CoreException(new Status(IStatus.WARNING, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), null));
-
- // load server.xml
- file = folder.getFile("server.xml");
- InputStream in = file.getContents();
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(in);
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V41))
- throw new Exception("Not a Tomcat v4.1 configuration");
- monitor.worked(200);
-
- // load web.xml
- file = folder.getFile("web.xml");
- webAppDocument = new WebAppDocument(file);
- monitor.worked(200);
-
- // load tomcat-users.xml
- file = folder.getFile("tomcat-users.xml");
- in = file.getContents();
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(in));
- monitor.worked(200);
-
- // load catalina.policy
- file = folder.getFile("catalina.policy");
- in = file.getContents();
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(in));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(200);
-
- if (monitor.isCanceled())
- throw new Exception("Cancelled");
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not reload Tomcat v4.1 configuration from: " + folder.getFullPath() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Save to the given directory.
- * @param dir java.io.File
- * @param forceDirty boolean
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- * @exception java.io.IOException
- */
- protected void save(IPath path, boolean forceDirty, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 3);
-
- // make sure directory exists
- if (!path.toFile().exists()) {
- forceDirty = true;
- path.toFile().mkdir();
- }
- monitor.worked(1);
-
- // save files
- if (forceDirty || isServerDirty)
- serverFactory.save(path.append("server.xml").toOSString());
- monitor.worked(1);
-
- //if (forceDirty || isWebAppDirty)
- // webAppFactory.save(dirPath + "web.xml");
- //webAppDocument.save(path.toOSString(), forceDirty || isPolicyDirty);
- webAppDocument.save(path.append("web.xml").toOSString(), forceDirty);
- monitor.worked(1);
-
- if (forceDirty)
- XMLUtil.save(path.append("tomcat-users.xml").toOSString(), tomcatUsersDocument);
- monitor.worked(1);
-
- if (forceDirty || isPolicyDirty) {
- BufferedWriter bw = new BufferedWriter(new FileWriter(path.append("catalina.policy").toFile()));
- bw.write(policyFile);
- bw.close();
- }
- monitor.worked(1);
- isServerDirty = false;
- isPolicyDirty = false;
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v4.1 configuration to " + path, e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- public void save(IPath path, IProgressMonitor monitor) throws CoreException {
- save(path, true, monitor);
- }
-
- /**
- * Save the information held by this object to the given directory.
- *
- * @param dir
- * @param org.eclipse.core.runtime.IProgressMonitor monitor
- * @throws java.io.IOException
- */
- public void save(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 900);
-
- // save server.xml
- byte[] data = serverFactory.getContents();
- InputStream in = new ByteArrayInputStream(data);
- IFile file = folder.getFile("server.xml");
- if (file.exists()) {
- if (isServerDirty)
- file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- monitor.worked(200);
- } else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save web.xml
- webAppDocument.save(folder.getFile("web.xml"), ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save tomcat-users.xml
- data = XMLUtil.getContents(tomcatUsersDocument);
- in = new ByteArrayInputStream(data);
- file = folder.getFile("tomcat-users.xml");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save catalina.policy
- in = new ByteArrayInputStream(policyFile.getBytes());
- file = folder.getFile("catalina.policy");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v4.1 configuration to " + folder.toString(), e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- protected static boolean hasMDBListener(Server server) {
- if (server == null)
- return false;
-
- int count = server.getListenerCount();
- if (count == 0)
- return false;
-
- for (int i = 0; i < count; i++) {
- Listener listener = server.getListener(i);
- if (listener != null && listener.getClassName() != null && listener.getClassName().indexOf("mbean") >= 0)
- return true;
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41ConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41ConfigurationWorkingCopy.java
deleted file mode 100644
index 0c1abd6..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41ConfigurationWorkingCopy.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.IMimeMapping;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.ITomcatWebModule;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Engine;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Host;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Service;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-/**
- * Tomcat v4.1 server configuration.
- */
-public class Tomcat41ConfigurationWorkingCopy extends Tomcat41Configuration implements ITomcatConfigurationWorkingCopy {
- protected IServerConfigurationWorkingCopy wc;
-
- /**
- * Tomcat41Configuration constructor comment.
- */
- public Tomcat41ConfigurationWorkingCopy() {
- super();
- }
-
- public void initialize(IServerConfigurationWorkingCopy wc2) {
- this.wc = wc2;
- }
-
- public void setDefaults() { }
-
- public void handleSave(byte id, IProgressMonitor monitor) { }
-
- /**
- * Adds a mime mapping.
- * @param extension java.lang.String
- * @param mimeType java.lang.String
- */
- public void addMimeMapping(int index, IMimeMapping map) {
- webAppDocument.addMimeMapping(index, map);
- firePropertyChangeEvent(ADD_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Add a web module.
- * @param module org.eclipse.jst.server.tomcat.WebModule
- */
- public void addWebModule(int index, ITomcatWebModule module) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = (Context) host.createElement(index, "Context");
- context.setDocBase(module.getDocumentBase());
- context.setPath(module.getPath());
- context.setReloadable(module.isReloadable() ? "true" : "false");
- if (module.getMemento() != null && module.getMemento().length() > 0)
- context.setSource(module.getMemento());
- isServerDirty = true;
- firePropertyChangeEvent(ADD_WEB_MODULE_PROPERTY, null, module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error adding web module " + module.getPath(), e);
- }
- }
-
- /**
- * Localize the web projects in this configuration.
- *
- * @param file java.io.File
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- */
- public void localizeConfiguration(IPath path, TomcatServer server2, TomcatRuntime runtime, IProgressMonitor monitor) {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100);
-
- Tomcat41Configuration config = new Tomcat41Configuration();
- config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (monitor.isCanceled())
- return;
-
- if (!server2.isTestEnvironment()) {
- IServerConfigurationWorkingCopy scwc = config.getServerConfiguration().getWorkingCopy();
- ((Tomcat41ConfigurationWorkingCopy) scwc.getDelegate()).localizeWebModules();
- }
- monitor.worked(20);
-
- if (monitor.isCanceled())
- return;
-
- config.save(path, false, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (!monitor.isCanceled())
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Error localizing configuration", e);
- }
- }
-
- /**
- * Go through all of the web modules and make the document
- * base "local" to the configuration.
- */
- protected void localizeWebModules() {
- List modules = getWebModules();
-
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
- String memento = module.getMemento();
- if (memento != null && memento.length() > 0) {
- // update document base to a relative ref
- String docBase = getPathPrefix() + module.getPath();
- if (docBase.startsWith("/") || docBase.startsWith("\\"))
- docBase = docBase.substring(1);
- modifyWebModule(i, docBase, module.getPath(), module.isReloadable());
- }
- }
- }
-
- /**
- * Change the extension of a mime mapping.
- * @param index int
- * @param newExtension java.lang.String
- */
- public void modifyMimeMapping(int index, IMimeMapping map) {
- webAppDocument.modifyMimeMapping(index, map);
- firePropertyChangeEvent(MODIFY_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Modify the port with the given id.
- *
- * @param id java.lang.String
- * @param port int
- */
- public void modifyServerPort(String id, int port) {
- try {
- if ("server".equals(id)) {
- server.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- return;
- }
-
- int i = id.indexOf("/");
- int servNum = Integer.parseInt(id.substring(0, i));
- int connNum = Integer.parseInt(id.substring(i + 1));
-
- Service service = server.getService(servNum);
- Connector connector = service.getConnector(connNum);
- connector.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- } catch (Exception e) {
- Trace.trace("Error modifying server port " + id, e);
- }
- }
- /**
- * Change a web module.
- * @param index int
- * @param docBase java.lang.String
- * @param path java.lang.String
- * @param reloadable boolean
- */
- public void modifyWebModule(int index, String docBase, String path, boolean reloadable) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = host.getContext(index);
- context.setPath(path);
- context.setDocBase(docBase);
- context.setReloadable(reloadable ? "true" : "false");
- isServerDirty = true;
- WebModule module = new WebModule(path, docBase, null, reloadable);
- firePropertyChangeEvent(MODIFY_WEB_MODULE_PROPERTY, new Integer(index), module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error modifying web module " + index, e);
- }
- }
-
- /**
- * Removes a mime mapping.
- * @param index int
- */
- public void removeMimeMapping(int index) {
- webAppDocument.removeMimeMapping(index);
- firePropertyChangeEvent(REMOVE_MAPPING_PROPERTY, null, new Integer(index));
- }
-
- /**
- * Removes a web module.
- * @param index int
- */
- public void removeWebModule(int index) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- host.removeElement("Context", index);
- isServerDirty = true;
- firePropertyChangeEvent(REMOVE_WEB_MODULE_PROPERTY, null, new Integer(index));
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error removing module ref " + index, e);
- }
- }
-
- public void importFromPath(IPath path, IProgressMonitor monitor) throws CoreException {
- load(path, monitor);
- }
-
- public void importFromRuntime(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
- load(runtime.getLocation().append("conf"), monitor);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
deleted file mode 100644
index 6efc9bf..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.j2ee.IWebModule;
-/**
- *
- */
-public class Tomcat41Handler implements ITomcatVersionHandler {
- public boolean verifyInstallPath(IPath installPath) {
- if (installPath == null)
- return false;
-
- String s = installPath.lastSegment();
- if (s != null && s.startsWith("jakarta-tomcat-") && !s.startsWith("jakarta-tomcat-4.1"))
- return false;
- return TomcatPlugin.verifyInstallPath(installPath, TomcatPlugin.TOMCAT_41);
- }
-
- /**
- * Return the runtime class name.
- *
- * @return java.lang.String
- */
- public String getRuntimeClass() {
- return "org.apache.catalina.startup.Bootstrap";
- }
-
- public List getRuntimeClasspath(IPath installPath) {
- List cp = new ArrayList();
-
- // 4.1 - add bootstrap.jar from the Tomcat bin directory
- IPath binPath = installPath.append("bin");
- if (binPath.toFile().exists()) {
- IPath path = binPath.append("bootstrap.jar");
- cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
- }
-
- return cp;
- }
-
- /**
- * Return the program's runtime arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeProgramArguments(IPath configPath, boolean debug, boolean starting) {
- List list = new ArrayList();
- if (configPath != null) {
- list.add("-config");
- list.add("\"" + configPath.append("conf").append("server.xml").toOSString() + "\"");
- }
-
- if (debug)
- list.add("-debug");
-
- if (starting)
- list.add("start");
- else
- list.add("stop");
-
- String[] temp = new String[list.size()];
- list.toArray(temp);
- return temp;
- }
-
- /**
- * Return the runtime (VM) arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeVMArguments(IPath installPath, IPath configPath, boolean isSecure) {
- List list = new ArrayList();
- list.add("-Dcatalina.home=\"" + installPath.toOSString() + "\"");
-
- // run in secure mode
- if (isSecure) {
- IPath dir = configPath.append("conf").append("catalina.policy");
- list.add("-Djava.security.manager");
- list.add("-Djava.security.policy=\"" + dir.toOSString() + "\"");
- }
-
- String[] s = new String[list.size()];
- list.toArray(s);
- return s;
- }
-
- /**
- * Returns true if the given project is supported by this
- * server, and false otherwise.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return boolean
- */
- public IStatus canAddModule(IWebModule module) {
- if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()))
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec41"), null);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41RuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41RuntimeTargetHandler.java
deleted file mode 100644
index d96cb51..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41RuntimeTargetHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public class Tomcat41RuntimeTargetHandler extends TomcatRuntimeTargetHandler {
- public String getId() {
- return "org.eclipse.jst.server.tomcat.runtimeTarget.v41";
- }
-
- public String getLabel() {
- return TomcatPlugin.getResource("%target41runtime");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.target.IServerTargetDelegate#getClasspathEntries()
- */
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime) {
- IPath installPath = runtime.getLocation();
-
- if (installPath == null)
- return new IClasspathEntry[0];
-
- IPath path = installPath.append("common");
- List list = new ArrayList();
- addLibraryEntries(list, path.append("lib").toFile(), true);
- addLibraryEntries(list, path.append("endorsed").toFile(), true);
- //addLibraryEntry(list, path.append("classes").toFile()); // no longer supported by eclipse
- return resolveList(list);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java
deleted file mode 100644
index 0f0103b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java
+++ /dev/null
@@ -1,433 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.Factory;
-import org.eclipse.jst.server.tomcat.core.internal.xml.XMLUtil;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.*;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-import org.eclipse.wst.server.core.util.ServerPort;
-/**
- * Tomcat v5.0 server configuration.
- */
-public class Tomcat50Configuration extends TomcatConfiguration {
- protected static final String DEFAULT_SERVICE = "Catalina";
- protected Server server;
- protected Factory serverFactory;
- protected boolean isServerDirty;
-
- protected WebAppDocument webAppDocument;
-
- protected Document tomcatUsersDocument;
-
- protected String policyFile;
- protected boolean isPolicyDirty;
-
- /**
- * Tomcat50Configuration constructor comment.
- */
- public Tomcat50Configuration() {
- super();
- }
-
- /**
- * Returns the root of the docbase parameter.
- *
- * @return java.lang.String
- */
- protected String getDocBaseRoot() {
- return "webapps/";
- }
-
- /**
- * Return the port number.
- * @return int
- */
- public IServerPort getMainPort() {
- Iterator iterator = getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort port = (IServerPort) iterator.next();
- if (port.getName().equals("HTTP"))
- return port;
- }
- return null;
- }
-
- /**
- * Returns the mime mappings.
- * @return java.util.List
- */
- public List getMimeMappings() {
- return webAppDocument.getMimeMappings();
- }
-
- /**
- * Returns the prefix that is used in front of the
- * web module path property. (e.g. "webapps")
- *
- * @return java.lang.String
- */
- public String getPathPrefix() {
- return "";
- }
-
- /**
- * Return the docBase of the ROOT web module.
- *
- * @return java.lang.String
- */
- protected String getROOTModuleDocBase() {
- return "ROOT";
- }
-
- /**
- * Returns a list of ServerPorts that this configuration uses.
- *
- * @return java.util.List
- */
- public List getServerPorts() {
- List ports = new ArrayList();
-
- // first add server port
- try {
- int port = Integer.parseInt(server.getPort());
- ports.add(new ServerPort("server", "Server port", port, "TCPIP"));
- } catch (Exception e) { }
-
- // add connectors
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- int size2 = service.getConnectorCount();
- for (int j = 0; j < size2; j++) {
- Connector connector = service.getConnector(j);
- String name = "HTTP";
- String protocol2 = "HTTP";
- boolean advanced = true;
- String[] contentTypes = null;
- int port = -1;
- try {
- port = Integer.parseInt(connector.getPort());
- } catch (Exception e) { }
- String protocol = connector.getProtocol();
- if (protocol != null && protocol.length() > 0) {
- name = protocol;
- protocol2 = protocol;
- }
- if ("HTTP".equals(protocol))
- contentTypes = new String[] { "web", "webservices" };
- String secure = connector.getSecure();
- if (secure != null && secure.length() > 0) {
- name = "SSL";
- protocol2 = "SSL";
- } else
- advanced = false;
- ports.add(new ServerPort(i +"/" + j, name, port, protocol2, contentTypes, advanced));
- }
- }
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error getting server ports", e);
- }
- return ports;
- }
-
- /**
- * Return a list of the web modules in this server.
- * @return java.util.List
- */
- public List getWebModules() {
- List list = new ArrayList();
-
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- int size2 = host.getContextCount();
- for (int j = 0; j < size2; j++) {
- Context context = host.getContext(j);
- String reload = context.getReloadable();
- if (reload == null)
- reload = "false";
- WebModule module = new WebModule(context.getPath(),
- context.getDocBase(), context.getSource(),
- reload.equalsIgnoreCase("true") ? true : false);
- list.add(module);
- }
- }
- }
- } catch (Exception e) {
- Trace.trace("Error getting project refs", e);
- }
- return list;
- }
-
- /**
- *
- * @return org.eclipse.jst.server.tomcat.internal.Tomcat40Configuration
- */
- public void load(IPath path, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 5);
-
- // check for catalina.policy to verify that this is a v5.0 config
- InputStream in = new FileInputStream(path.append("catalina.policy").toFile());
- in.read();
- in.close();
- monitor.worked(1);
-
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(new FileInputStream(path.append("server.xml").toFile()));
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V50))
- throw new CoreException(null);
- monitor.worked(1);
-
- webAppDocument = new WebAppDocument(path.append("web.xml"));
- monitor.worked(1);
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(new FileInputStream(path.append("tomcat-users.xml").toFile())));
- monitor.worked(1);
-
- // load policy file
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(new FileInputStream(path.append("catalina.policy").toFile())));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(1);
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load Tomcat v5.0 configuration from " + path.toOSString() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Reload the configuration.
- */
- public void load(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 800);
-
- // check for catalina.policy to verify that this is a v4.0 config
- IFile file = folder.getFile("catalina.policy");
- if (!file.exists())
- throw new CoreException(new Status(IStatus.WARNING, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), null));
-
- // load server.xml
- file = folder.getFile("server.xml");
- InputStream in = file.getContents();
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(in);
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V41))
- throw new Exception("Not a Tomcat v5.0 configuration");
- monitor.worked(200);
-
- // load web.xml
- file = folder.getFile("web.xml");
- webAppDocument = new WebAppDocument(file);
- monitor.worked(200);
-
- // load tomcat-users.xml
- file = folder.getFile("tomcat-users.xml");
- in = file.getContents();
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(in));
- monitor.worked(200);
-
- // load catalina.policy
- file = folder.getFile("catalina.policy");
- in = file.getContents();
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(in));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(200);
-
- if (monitor.isCanceled())
- throw new Exception("Cancelled");
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not reload Tomcat v5.0 configuration from: " + folder.getFullPath() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Save to the given directory.
- * @param dir java.io.File
- * @param forceDirty boolean
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- * @exception java.io.IOException
- */
- protected void save(IPath path, boolean forceDirty, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 3);
-
- // make sure directory exists
- if (!path.toFile().exists()) {
- forceDirty = true;
- path.toFile().mkdir();
- }
- monitor.worked(1);
-
- // save files
- if (forceDirty || isServerDirty)
- serverFactory.save(path.append("server.xml").toOSString());
- monitor.worked(1);
-
- //if (forceDirty || isWebAppDirty)
- // webAppFactory.save(dirPath + "web.xml");
- //webAppDocument.save(path.toOSString(), forceDirty || isPolicyDirty);
- webAppDocument.save(path.append("web.xml").toOSString(), forceDirty);
- monitor.worked(1);
-
- if (forceDirty)
- XMLUtil.save(path.append("tomcat-users.xml").toOSString(), tomcatUsersDocument);
- monitor.worked(1);
-
- if (forceDirty || isPolicyDirty) {
- BufferedWriter bw = new BufferedWriter(new FileWriter(path.append("catalina.policy").toFile()));
- bw.write(policyFile);
- bw.close();
- }
- monitor.worked(1);
- isServerDirty = false;
- isPolicyDirty = false;
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v5.0 configuration to " + path, e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- public void save(IPath path, IProgressMonitor monitor) throws CoreException {
- save(path, true, monitor);
- }
-
- /**
- * Save the information held by this object to the given directory.
- *
- * @param dir
- * @param org.eclipse.core.runtime.IProgressMonitor monitor
- * @throws java.io.IOException
- */
- public void save(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 900);
-
- // save server.xml
- byte[] data = serverFactory.getContents();
- InputStream in = new ByteArrayInputStream(data);
- IFile file = folder.getFile("server.xml");
- if (file.exists()) {
- if (isServerDirty)
- file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- monitor.worked(200);
- } else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save web.xml
- webAppDocument.save(folder.getFile("web.xml"), ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save tomcat-users.xml
- data = XMLUtil.getContents(tomcatUsersDocument);
- in = new ByteArrayInputStream(data);
- file = folder.getFile("tomcat-users.xml");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save catalina.policy
- in = new ByteArrayInputStream(policyFile.getBytes());
- file = folder.getFile("catalina.policy");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v5.0 configuration to " + folder.toString(), e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- protected static boolean hasMDBListener(Server server) {
- if (server == null)
- return false;
-
- int count = server.getListenerCount();
- if (count == 0)
- return false;
-
- for (int i = 0; i < count; i++) {
- Listener listener = server.getListener(i);
- if (listener != null && listener.getClassName() != null && listener.getClassName().indexOf("mbean") >= 0)
- return true;
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50ConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50ConfigurationWorkingCopy.java
deleted file mode 100644
index cc50521..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50ConfigurationWorkingCopy.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.IMimeMapping;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.ITomcatWebModule;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Engine;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Host;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Service;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-/**
- * Tomcat v4.1 server configuration.
- */
-public class Tomcat50ConfigurationWorkingCopy extends Tomcat50Configuration implements ITomcatConfigurationWorkingCopy {
- protected IServerConfigurationWorkingCopy wc;
-
- /**
- * Tomcat50Configuration constructor comment.
- */
- public Tomcat50ConfigurationWorkingCopy() {
- super();
- }
-
- public void initialize(IServerConfigurationWorkingCopy wc2) {
- this.wc = wc2;
- }
-
- public void setDefaults() { }
-
- public void handleSave(byte id, IProgressMonitor monitor) { }
-
- /**
- * Adds a mime mapping.
- * @param extension java.lang.String
- * @param mimeType java.lang.String
- */
- public void addMimeMapping(int index, IMimeMapping map) {
- webAppDocument.addMimeMapping(index, map);
- firePropertyChangeEvent(ADD_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Add a web module.
- * @param module org.eclipse.jst.server.tomcat.WebModule
- */
- public void addWebModule(int index, ITomcatWebModule module) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = (Context) host.createElement(index, "Context");
- context.setDocBase(module.getDocumentBase());
- context.setPath(module.getPath());
- context.setReloadable(module.isReloadable() ? "true" : "false");
- if (module.getMemento() != null && module.getMemento().length() > 0)
- context.setSource(module.getMemento());
- isServerDirty = true;
- firePropertyChangeEvent(ADD_WEB_MODULE_PROPERTY, null, module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error adding web module " + module.getPath(), e);
- }
- }
-
- /**
- * Localize the web projects in this configuration.
- *
- * @param file java.io.File
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- */
- public void localizeConfiguration(IPath path, TomcatServer server2, TomcatRuntime runtime, IProgressMonitor monitor) {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100);
-
- Tomcat50Configuration config = new Tomcat50Configuration();
- config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (monitor.isCanceled())
- return;
-
- if (!server2.isTestEnvironment()) {
- IServerConfigurationWorkingCopy scwc = config.getServerConfiguration().getWorkingCopy();
- ((Tomcat50ConfigurationWorkingCopy) scwc.getDelegate()).localizeWebModules();
- }
- monitor.worked(20);
-
- if (monitor.isCanceled())
- return;
-
- config.save(path, false, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (!monitor.isCanceled())
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Error localizing configuration", e);
- }
- }
-
- /**
- * Go through all of the web modules and make the document
- * base "local" to the configuration.
- */
- protected void localizeWebModules() {
- List modules = getWebModules();
-
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
- String memento = module.getMemento();
- if (memento != null && memento.length() > 0) {
- // update document base to a relative ref
- String docBase = getPathPrefix() + module.getPath();
- if (docBase.startsWith("/") || docBase.startsWith("\\"))
- docBase = docBase.substring(1);
- modifyWebModule(i, docBase, module.getPath(), module.isReloadable());
- }
- }
- }
-
- /**
- * Change the extension of a mime mapping.
- * @param index int
- * @param newExtension java.lang.String
- */
- public void modifyMimeMapping(int index, IMimeMapping map) {
- webAppDocument.modifyMimeMapping(index, map);
- firePropertyChangeEvent(MODIFY_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Modify the port with the given id.
- *
- * @param id java.lang.String
- * @param port int
- */
- public void modifyServerPort(String id, int port) {
- try {
- if ("server".equals(id)) {
- server.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- return;
- }
-
- int i = id.indexOf("/");
- int servNum = Integer.parseInt(id.substring(0, i));
- int connNum = Integer.parseInt(id.substring(i + 1));
-
- Service service = server.getService(servNum);
- Connector connector = service.getConnector(connNum);
- connector.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- } catch (Exception e) {
- Trace.trace("Error modifying server port " + id, e);
- }
- }
- /**
- * Change a web module.
- * @param index int
- * @param docBase java.lang.String
- * @param path java.lang.String
- * @param reloadable boolean
- */
- public void modifyWebModule(int index, String docBase, String path, boolean reloadable) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = host.getContext(index);
- context.setPath(path);
- context.setDocBase(docBase);
- context.setReloadable(reloadable ? "true" : "false");
- isServerDirty = true;
- WebModule module = new WebModule(path, docBase, null, reloadable);
- firePropertyChangeEvent(MODIFY_WEB_MODULE_PROPERTY, new Integer(index), module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error modifying web module " + index, e);
- }
- }
-
- /**
- * Removes a mime mapping.
- * @param index int
- */
- public void removeMimeMapping(int index) {
- webAppDocument.removeMimeMapping(index);
- firePropertyChangeEvent(REMOVE_MAPPING_PROPERTY, null, new Integer(index));
- }
-
- /**
- * Removes a web module.
- * @param index int
- */
- public void removeWebModule(int index) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- host.removeElement("Context", index);
- isServerDirty = true;
- firePropertyChangeEvent(REMOVE_WEB_MODULE_PROPERTY, null, new Integer(index));
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error removing module ref " + index, e);
- }
- }
-
- public void importFromPath(IPath path, IProgressMonitor monitor) throws CoreException {
- load(path, monitor);
- }
-
- public void importFromRuntime(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
- load(runtime.getLocation().append("conf"), monitor);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
deleted file mode 100644
index 9371e9a..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.j2ee.IWebModule;
-/**
- *
- */
-public class Tomcat50Handler implements ITomcatVersionHandler {
- public boolean verifyInstallPath(IPath installPath) {
- if (installPath == null)
- return false;
-
- String s = installPath.lastSegment();
- if (s != null && s.startsWith("jakarta-tomcat-") && !s.startsWith("jakarta-tomcat-5.0"))
- return false;
- return TomcatPlugin.verifyInstallPath(installPath, TomcatPlugin.TOMCAT_50);
- }
-
- /**
- * Return the runtime class name.
- *
- * @return java.lang.String
- */
- public String getRuntimeClass() {
- return "org.apache.catalina.startup.Bootstrap";
- }
-
- public List getRuntimeClasspath(IPath installPath) {
- List cp = new ArrayList();
-
- // 5.0 - add bootstrap.jar from the Tomcat bin directory
- IPath binPath = installPath.append("bin");
- if (binPath.toFile().exists()) {
- IPath path = binPath.append("bootstrap.jar");
- cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
- }
-
- return cp;
- }
-
- /**
- * Return the program's runtime arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeProgramArguments(IPath configPath, boolean debug, boolean starting) {
- List list = new ArrayList();
- if (configPath != null) {
- list.add("-config");
- list.add("\"" + configPath.append("conf").append("server.xml").toOSString() + "\"");
- }
-
- if (debug)
- list.add("-debug");
-
- if (starting)
- list.add("start");
- else
- list.add("stop");
-
- String[] temp = new String[list.size()];
- list.toArray(temp);
- return temp;
- }
-
- /**
- * Return the runtime (VM) arguments.
- *
- * @return java.lang.String[]
- */
- public String[] getRuntimeVMArguments(IPath installPath, IPath configPath, boolean isSecure) {
- List list = new ArrayList();
- list.add("-Dcatalina.home=\"" + installPath.toOSString() + "\"");
-
- // run in secure mode
- if (isSecure) {
- IPath dir = configPath.append("conf").append("catalina.policy");
- list.add("-Djava.security.manager");
- list.add("-Djava.security.policy=\"" + dir.toOSString() + "\"");
- }
-
- String[] s = new String[list.size()];
- list.toArray(s);
- return s;
- }
-
- /**
- * Returns true if the given project is supported by this
- * server, and false otherwise.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return boolean
- */
- public IStatus canAddModule(IWebModule module) {
- if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()) || "1.4".equals(module.getJ2EESpecificationVersion()))
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec50"), null);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50RuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50RuntimeTargetHandler.java
deleted file mode 100644
index c514873..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50RuntimeTargetHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public class Tomcat50RuntimeTargetHandler extends TomcatRuntimeTargetHandler {
- public String getId() {
- return "org.eclipse.jst.server.tomcat.runtimeTarget.v50";
- }
-
- public String getLabel() {
- return TomcatPlugin.getResource("%target50runtime");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.target.IServerTargetDelegate#getClasspathEntries()
- */
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime) {
- IPath installPath = runtime.getLocation();
-
- if (installPath == null)
- return new IClasspathEntry[0];
-
- IPath path = installPath.append("common");
- List list = new ArrayList();
- addLibraryEntries(list, path.append("lib").toFile(), true);
- addLibraryEntries(list, path.append("endorsed").toFile(), true);
- // addLibraryEntry(list, path.append("classes").toFile()); // no longer supported by eclipse
- return resolveList(list);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java
deleted file mode 100644
index 2c3d2c0..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java
+++ /dev/null
@@ -1,449 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.Factory;
-import org.eclipse.jst.server.tomcat.core.internal.xml.XMLUtil;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Engine;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Host;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Listener;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Server;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Service;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-import org.eclipse.wst.server.core.util.ServerPort;
-/**
- * Tomcat v5.5 server configuration.
- */
-public class Tomcat55Configuration extends TomcatConfiguration {
- protected static final String DEFAULT_SERVICE = "Catalina";
- protected Server server;
- protected Factory serverFactory;
- protected boolean isServerDirty;
-
- protected WebAppDocument webAppDocument;
-
- protected Document tomcatUsersDocument;
-
- protected String policyFile;
- protected boolean isPolicyDirty;
-
- /**
- * Tomcat55Configuration constructor comment.
- */
- public Tomcat55Configuration() {
- super();
- }
-
- /**
- * Returns the root of the docbase parameter.
- *
- * @return java.lang.String
- */
- protected String getDocBaseRoot() {
- return "webapps/";
- }
-
- /**
- * Return the port number.
- * @return int
- */
- public IServerPort getMainPort() {
- Iterator iterator = getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort port = (IServerPort) iterator.next();
- if (port.getName().equals("HTTP"))
- return port;
- }
- return null;
- }
-
- /**
- * Returns the mime mappings.
- * @return java.util.List
- */
- public List getMimeMappings() {
- return webAppDocument.getMimeMappings();
- }
-
- /**
- * Returns the prefix that is used in front of the
- * web module path property. (e.g. "webapps")
- *
- * @return java.lang.String
- */
- public String getPathPrefix() {
- return "";
- }
-
- /**
- * Return the docBase of the ROOT web module.
- *
- * @return java.lang.String
- */
- protected String getROOTModuleDocBase() {
- return "ROOT";
- }
-
- /**
- * Returns a list of ServerPorts that this configuration uses.
- *
- * @return java.util.List
- */
- public List getServerPorts() {
- List ports = new ArrayList();
-
- // first add server port
- try {
- int port = Integer.parseInt(server.getPort());
- ports.add(new ServerPort("server", "Server port", port, "TCPIP"));
- } catch (Exception e) { }
-
- // add connectors
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- int size2 = service.getConnectorCount();
- for (int j = 0; j < size2; j++) {
- Connector connector = service.getConnector(j);
- String name = "HTTP";
- String protocol2 = "TCPIP";
- boolean advanced = true;
- String[] contentTypes = null;
- int port = -1;
- try {
- port = Integer.parseInt(connector.getPort());
- } catch (Exception e) { }
- String protocol = connector.getProtocol();
- if (protocol != null && protocol.length() > 0) {
- name = protocol;
- protocol2 = protocol;
- }
- if ("HTTP".equals(protocol))
- contentTypes = new String[] { "web", "webservices" };
- String secure = connector.getSecure();
- if (secure != null && secure.length() > 0) {
- name = "SSL";
- protocol2 = "SSL";
- } else
- advanced = false;
- ports.add(new ServerPort(i +"/" + j, name, port, protocol2, contentTypes, advanced));
- }
- }
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error getting server ports", e);
- }
- return ports;
- }
-
- /**
- * Return a list of the web modules in this server.
- * @return java.util.List
- */
- public List getWebModules() {
- List list = new ArrayList();
-
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- int size2 = host.getContextCount();
- for (int j = 0; j < size2; j++) {
- Context context = host.getContext(j);
- String reload = context.getReloadable();
- if (reload == null)
- reload = "false";
- WebModule module = new WebModule(context.getPath(),
- context.getDocBase(), context.getSource(),
- reload.equalsIgnoreCase("true") ? true : false);
- list.add(module);
- }
- }
- }
- } catch (Exception e) {
- Trace.trace("Error getting project refs", e);
- }
- return list;
- }
-
- /**
- *
- * @return org.eclipse.jst.server.tomcat.internal.Tomcat40Configuration
- */
- public void load(IPath path, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 5);
-
- // check for catalina.policy to verify that this is a v5.5 config
- InputStream in = new FileInputStream(path.append("catalina.policy").toFile());
- in.read();
- in.close();
- monitor.worked(1);
-
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(new FileInputStream(path.append("server.xml").toFile()));
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V55))
- throw new CoreException(null);
- monitor.worked(1);
-
- webAppDocument = new WebAppDocument(path.append("web.xml"));
- monitor.worked(1);
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(new FileInputStream(path.append("tomcat-users.xml").toFile())));
- monitor.worked(1);
-
- // load policy file
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(new FileInputStream(path.append("catalina.policy").toFile())));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(1);
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load Tomcat v5.5 configuration from " + path.toOSString() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Reload the configuration.
- */
- public void load(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%loadingTask"), 800);
-
- // check for catalina.policy to verify that this is a v4.0 config
- IFile file = folder.getFile("catalina.policy");
- if (!file.exists())
- throw new CoreException(new Status(IStatus.WARNING, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), null));
-
- // load server.xml
- file = folder.getFile("server.xml");
- InputStream in = file.getContents();
- serverFactory = new Factory();
- serverFactory.setPackageName("org.eclipse.jst.server.tomcat.core.internal.xml.server40");
- server = (Server) serverFactory.loadDocument(in);
- if (!TomcatConfigurationUtil.verifyConfiguration(this, TomcatConfigurationUtil.CONFIGURATION_V41))
- throw new Exception("Not a Tomcat v5.5 configuration");
- monitor.worked(200);
-
- // load web.xml
- file = folder.getFile("web.xml");
- webAppDocument = new WebAppDocument(file);
- monitor.worked(200);
-
- // load tomcat-users.xml
- file = folder.getFile("tomcat-users.xml");
- in = file.getContents();
-
- tomcatUsersDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(in));
- monitor.worked(200);
-
- // load catalina.policy
- file = folder.getFile("catalina.policy");
- in = file.getContents();
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(in));
- String temp = br.readLine();
- policyFile = "";
- while (temp != null) {
- policyFile += temp + "\n";
- temp = br.readLine();
- }
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not load policy file", e);
- } finally {
- if (br != null)
- br.close();
- }
- monitor.worked(200);
-
- if (monitor.isCanceled())
- throw new Exception("Cancelled");
- monitor.done();
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not reload Tomcat v5.5 configuration from: " + folder.getFullPath() + ": " + e.getMessage());
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotLoadConfiguration"), e));
- }
- }
-
- /**
- * Save to the given directory.
- * @param dir java.io.File
- * @param forceDirty boolean
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- * @exception java.io.IOException
- */
- protected void save(IPath path, boolean forceDirty, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 3);
-
- // make sure directory exists
- if (!path.toFile().exists()) {
- forceDirty = true;
- path.toFile().mkdir();
- }
- monitor.worked(1);
-
- // save files
- if (forceDirty || isServerDirty)
- serverFactory.save(path.append("server.xml").toOSString());
- monitor.worked(1);
-
- //if (forceDirty || isWebAppDirty)
- // webAppFactory.save(dirPath + "web.xml");
- //webAppDocument.save(path.toOSString(), forceDirty || isPolicyDirty);
- webAppDocument.save(path.append("web.xml").toOSString(), forceDirty);
- monitor.worked(1);
-
- if (forceDirty)
- XMLUtil.save(path.append("tomcat-users.xml").toOSString(), tomcatUsersDocument);
- monitor.worked(1);
-
- if (forceDirty || isPolicyDirty) {
- BufferedWriter bw = new BufferedWriter(new FileWriter(path.append("catalina.policy").toFile()));
- bw.write(policyFile);
- bw.close();
- }
- monitor.worked(1);
- isServerDirty = false;
- isPolicyDirty = false;
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v5.5 configuration to " + path, e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- public void save(IPath path, IProgressMonitor monitor) throws CoreException {
- save(path, true, monitor);
- }
-
- /**
- * Save the information held by this object to the given directory.
- *
- * @param dir
- * @param org.eclipse.core.runtime.IProgressMonitor monitor
- * @throws java.io.IOException
- */
- public void save(IFolder folder, IProgressMonitor monitor) throws CoreException {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%savingTask"), 900);
-
- // save server.xml
- byte[] data = serverFactory.getContents();
- InputStream in = new ByteArrayInputStream(data);
- IFile file = folder.getFile("server.xml");
- if (file.exists()) {
- if (isServerDirty)
- file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- monitor.worked(200);
- } else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save web.xml
- webAppDocument.save(folder.getFile("web.xml"), ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save tomcat-users.xml
- data = XMLUtil.getContents(tomcatUsersDocument);
- in = new ByteArrayInputStream(data);
- file = folder.getFile("tomcat-users.xml");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- // save catalina.policy
- in = new ByteArrayInputStream(policyFile.getBytes());
- file = folder.getFile("catalina.policy");
- if (file.exists())
- monitor.worked(200);
- //file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
-
- if (monitor.isCanceled())
- return;
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Could not save Tomcat v5.5 configuration to " + folder.toString(), e);
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorCouldNotSaveConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
-
- protected static boolean hasMDBListener(Server server) {
- if (server == null)
- return false;
-
- int count = server.getListenerCount();
- if (count == 0)
- return false;
-
- for (int i = 0; i < count; i++) {
- Listener listener = server.getListener(i);
- if (listener != null && listener.getClassName() != null && listener.getClassName().indexOf("mbean") >= 0)
- return true;
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55ConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55ConfigurationWorkingCopy.java
deleted file mode 100644
index df1c811..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55ConfigurationWorkingCopy.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.IMimeMapping;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.ITomcatWebModule;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Connector;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Context;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Engine;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Host;
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Service;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-/**
- * Tomcat v5.5 server configuration.
- */
-public class Tomcat55ConfigurationWorkingCopy extends Tomcat55Configuration implements ITomcatConfigurationWorkingCopy {
- protected IServerConfigurationWorkingCopy wc;
-
- /**
- * Tomcat55Configuration constructor comment.
- */
- public Tomcat55ConfigurationWorkingCopy() {
- super();
- }
-
- public void initialize(IServerConfigurationWorkingCopy wc2) {
- this.wc = wc2;
- }
-
- public void setDefaults() { }
-
- public void handleSave(byte id, IProgressMonitor monitor) { }
-
- /**
- * Adds a mime mapping.
- * @param extension java.lang.String
- * @param mimeType java.lang.String
- */
- public void addMimeMapping(int index, IMimeMapping map) {
- webAppDocument.addMimeMapping(index, map);
- firePropertyChangeEvent(ADD_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Add a web module.
- * @param module org.eclipse.jst.server.tomcat.WebModule
- */
- public void addWebModule(int index, ITomcatWebModule module) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = (Context) host.createElement(index, "Context");
- context.setDocBase(module.getDocumentBase());
- context.setPath(module.getPath());
- context.setReloadable(module.isReloadable() ? "true" : "false");
- if (module.getMemento() != null && module.getMemento().length() > 0)
- context.setSource(module.getMemento());
- isServerDirty = true;
- firePropertyChangeEvent(ADD_WEB_MODULE_PROPERTY, null, module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error adding web module " + module.getPath(), e);
- }
- }
-
- /**
- * Localize the web projects in this configuration.
- *
- * @param file java.io.File
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- */
- public void localizeConfiguration(IPath path, TomcatServer server2, TomcatRuntime runtime, IProgressMonitor monitor) {
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100);
-
- Tomcat55Configuration config = new Tomcat55Configuration();
- config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (monitor.isCanceled())
- return;
-
- if (!server2.isTestEnvironment()) {
- IServerConfigurationWorkingCopy scwc = config.getServerConfiguration().getWorkingCopy();
- ((Tomcat55ConfigurationWorkingCopy) scwc.getDelegate()).localizeWebModules();
- }
- monitor.worked(20);
-
- if (monitor.isCanceled())
- return;
-
- config.save(path, false, ProgressUtil.getSubMonitorFor(monitor, 40));
-
- if (!monitor.isCanceled())
- monitor.done();
- } catch (Exception e) {
- Trace.trace("Error localizing configuration", e);
- }
- }
-
- /**
- * Go through all of the web modules and make the document
- * base "local" to the configuration.
- */
- protected void localizeWebModules() {
- List modules = getWebModules();
-
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
- String memento = module.getMemento();
- if (memento != null && memento.length() > 0) {
- // update document base to a relative ref
- String docBase = getPathPrefix() + module.getPath();
- if (docBase.startsWith("/") || docBase.startsWith("\\"))
- docBase = docBase.substring(1);
- modifyWebModule(i, docBase, module.getPath(), module.isReloadable());
- }
- }
- }
-
- /**
- * Change the extension of a mime mapping.
- * @param index int
- * @param newExtension java.lang.String
- */
- public void modifyMimeMapping(int index, IMimeMapping map) {
- webAppDocument.modifyMimeMapping(index, map);
- firePropertyChangeEvent(MODIFY_MAPPING_PROPERTY, new Integer(index), map);
- }
-
- /**
- * Modify the port with the given id.
- *
- * @param id java.lang.String
- * @param port int
- */
- public void modifyServerPort(String id, int port) {
- try {
- if ("server".equals(id)) {
- server.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- return;
- }
-
- int i = id.indexOf("/");
- int servNum = Integer.parseInt(id.substring(0, i));
- int connNum = Integer.parseInt(id.substring(i + 1));
-
- Service service = server.getService(servNum);
- Connector connector = service.getConnector(connNum);
- connector.setPort(port + "");
- isServerDirty = true;
- firePropertyChangeEvent(MODIFY_PORT_PROPERTY, id, new Integer(port));
- } catch (Exception e) {
- Trace.trace("Error modifying server port " + id, e);
- }
- }
- /**
- * Change a web module.
- * @param index int
- * @param docBase java.lang.String
- * @param path java.lang.String
- * @param reloadable boolean
- */
- public void modifyWebModule(int index, String docBase, String path, boolean reloadable) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- Context context = host.getContext(index);
- context.setPath(path);
- context.setDocBase(docBase);
- context.setReloadable(reloadable ? "true" : "false");
- isServerDirty = true;
- WebModule module = new WebModule(path, docBase, null, reloadable);
- firePropertyChangeEvent(MODIFY_WEB_MODULE_PROPERTY, new Integer(index), module);
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error modifying web module " + index, e);
- }
- }
-
- /**
- * Removes a mime mapping.
- * @param index int
- */
- public void removeMimeMapping(int index) {
- webAppDocument.removeMimeMapping(index);
- firePropertyChangeEvent(REMOVE_MAPPING_PROPERTY, null, new Integer(index));
- }
-
- /**
- * Removes a web module.
- * @param index int
- */
- public void removeWebModule(int index) {
- try {
- int size = server.getServiceCount();
- for (int i = 0; i < size; i++) {
- Service service = server.getService(i);
- if (service.getName().equalsIgnoreCase(DEFAULT_SERVICE)) {
- Engine engine = service.getEngine();
- Host host = engine.getHost();
- host.removeElement("Context", index);
- isServerDirty = true;
- firePropertyChangeEvent(REMOVE_WEB_MODULE_PROPERTY, null, new Integer(index));
- return;
- }
- }
- } catch (Exception e) {
- Trace.trace("Error removing module ref " + index, e);
- }
- }
-
- public void importFromPath(IPath path, IProgressMonitor monitor) throws CoreException {
- load(path, monitor);
- }
-
- public void importFromRuntime(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
- load(runtime.getLocation().append("conf"), monitor);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Handler.java
deleted file mode 100644
index 891f976..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Handler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.j2ee.IWebModule;
-/**
- *
- */
-public class Tomcat55Handler extends Tomcat50Handler {
- public boolean verifyInstallPath(IPath installPath) {
- if (installPath == null)
- return false;
-
- String s = installPath.lastSegment();
- if (s != null && s.startsWith("jakarta-tomcat-") && !s.startsWith("jakarta-tomcat-5.5"))
- return false;
- return TomcatPlugin.verifyInstallPath(installPath, TomcatPlugin.TOMCAT_55);
- }
-
- /**
- * Returns true if the given project is supported by this
- * server, and false otherwise.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return boolean
- */
- public IStatus canAddModule(IWebModule module) {
- if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()) || "1.4".equals(module.getJ2EESpecificationVersion()))
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec55"), null);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55RuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55RuntimeTargetHandler.java
deleted file mode 100644
index cae2d19..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55RuntimeTargetHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- *
- */
-public class Tomcat55RuntimeTargetHandler extends Tomcat50RuntimeTargetHandler {
- public String getId() {
- return "org.eclipse.jst.server.tomcat.runtimeTarget.v55";
- }
-
- public String getLabel() {
- return TomcatPlugin.getResource("%target55runtime");
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java
deleted file mode 100644
index 4a18a1d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.File;
-import java.io.InputStream;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.util.FileUtil;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-import org.eclipse.wst.server.core.util.ServerConfigurationDelegate;
-/**
- * Generic Tomcat server configuration.
- */
-public abstract class TomcatConfiguration extends ServerConfigurationDelegate implements ITomcatConfiguration {
- public static final String NAME_PROPERTY = "name";
- public static final String PORT_PROPERTY = "port";
- public static final String MODIFY_PORT_PROPERTY = "modifyPort";
- public static final String ADD_MAPPING_PROPERTY = "addMapping";
- public static final String REMOVE_MAPPING_PROPERTY = "removeMapping";
- public static final String MODIFY_MAPPING_PROPERTY = "modifyMapping";
-
- public static final String MODIFY_WEB_MODULE_PROPERTY = "modifyWebModule";
- public static final String ADD_WEB_MODULE_PROPERTY = "addWebModule";
- public static final String REMOVE_WEB_MODULE_PROPERTY = "removeWebModule";
-
- /**
- * TomcatConfiguration constructor comment.
- */
- public TomcatConfiguration() {
- super();
- }
-
- /**
- * Copies all files from the given directory in the workbench
- * to the given location.
- *
- * @param from java.io.File
- * @param to java.io.File
- * @return org.eclipse.core.runtime.IStatus
- */
- protected IStatus backupAndPublish(IPath confDir, boolean doBackup, IProgressMonitor monitor) {
- MultiStatus ms = new MultiStatus(TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%publishConfigurationTask"), null);
- Trace.trace("Backup and publish");
- try {
- monitor = ProgressUtil.getMonitorFor(monitor);
-
- IPath backup = null;
- if (doBackup) {
- // create backup directory
- backup = confDir.append("backup");
- if (!backup.toFile().exists())
- backup.toFile().mkdir();
- }
-
- confDir = confDir.append("conf");
-
- IFolder folder = configuration.getConfigurationDataFolder();
- if (folder != null)
- backupFolder(folder, confDir, backup, ms, monitor);
- else {
- IPath path = configuration.getConfigurationDataPath();
- backupPath(path, confDir, backup, ms, monitor);
- }
-
- } catch (Exception e) {
- Trace.trace("backupAndPublish() error", e);
- IStatus s = new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorPublishConfiguration", new String[] {e.getLocalizedMessage()}), e);
- ms.add(s);
- }
- monitor.done();
- return ms;
- }
-
- protected void backupFolder(IFolder folder, IPath confDir, IPath backup, MultiStatus ms, IProgressMonitor monitor) throws CoreException {
- IResource[] children = folder.members();
- if (children == null)
- return;
-
- int size = children.length;
- monitor.beginTask(TomcatPlugin.getResource("%publishConfigurationTask"), size * 100);
- for (int i = 0; i < size; i++) {
- if (children[i] instanceof IFile) {
- try {
- IFile file = (IFile) children[i];
- String name = file.getName();
- monitor.subTask(TomcatPlugin.getResource("%publisherPublishTask", new String[] {name}));
- Trace.trace(Trace.FINEST, "Publishing " + name);
-
- // backup and copy file
- boolean copy = true;
- if (backup != null && !(backup.append(name).toFile().exists())) {
- IStatus status = FileUtil.copyFile(confDir.append(name).toOSString(), backup + File.separator + name);
- ms.add(status);
- if (!status.isOK())
- copy = false;
- }
-
- if (copy) {
- InputStream in = file.getContents();
- ms.add(FileUtil.copyFile(in, confDir.append(name).toOSString()));
- }
- } catch (Exception e) {
- Trace.trace("backupAndPublish() error", e);
- ms.add(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorPublishConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- }
- monitor.worked(100);
- }
- }
-
- protected void backupPath(IPath path, IPath confDir, IPath backup, MultiStatus ms, IProgressMonitor monitor) {
- File[] files = path.toFile().listFiles();
- if (files == null)
- return;
-
- int size = files.length;
- monitor.beginTask(TomcatPlugin.getResource("%publishConfigurationTask"), size * 100);
- for (int i = 0; i < size; i++) {
- try {
- File file = files[i];
- String name = file.getName();
- monitor.subTask(TomcatPlugin.getResource("%publisherPublishTask", new String[] {name}));
- Trace.trace(Trace.FINEST, "Publishing " + name);
-
- // backup and copy file
- boolean copy = true;
- if (backup != null && !(backup.append(name).toFile().exists())) {
- IStatus status = FileUtil.copyFile(confDir.append(name).toOSString(), backup + File.separator + name);
- ms.add(status);
- if (!status.isOK())
- copy = false;
- }
-
- if (copy)
- ms.add(FileUtil.copyFile(file.getAbsolutePath(), confDir.append(name).toOSString()));
- } catch (Exception e) {
- Trace.trace("backupAndPublish() error", e);
- ms.add(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorPublishConfiguration", new String[] {e.getLocalizedMessage()}), e));
- }
- monitor.worked(100);
- }
- }
-
- /**
- * Returns the root of the docbase parameter.
- *
- * @return java.lang.String
- */
- protected abstract String getDocBaseRoot();
-
- /**
- * Returns the main server port.
- * @return IServerPort
- */
- public abstract IServerPort getMainPort();
-
- /**
- * Returns the prefix that is used in front of the
- * web module path property. (e.g. "webapps")
- *
- * @return java.lang.String
- */
- public abstract String getPathPrefix();
-
- /**
- * Returns the partial URL applicable to this module.
- *
- * @return java.lang.String
- * @param module IWebModule
- */
- protected String getWebModuleURL(IWebModule webModule) {
- WebModule module = getWebModule(webModule);
- if (module != null)
- return module.getPath();
-
- return webModule.getContextRoot();
- }
-
- /**
- * Returns the partial URL applicable to this project.
- *
- * @return java.lang.String
- * @param project org.eclipse.core.resources.IProject
- */
- protected WebModule getWebModule(IWebModule webModule) {
- if (webModule == null)
- return null;
-
- String memento = webModule.getFactoryId() + ":" + webModule.getId();
-
- List modules = getWebModules();
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
- if (memento.equals(module.getMemento())) {
- return module;
- }
- }
- return null;
- }
-
- /**
- * Return the docBase of the ROOT web module.
- *
- * @return java.lang.String
- */
- protected abstract String getROOTModuleDocBase();
-
- /**
- * Save to the given directory.
- * @param f java.io.File
- * @param forceSave boolean
- * @exception java.io.IOException
- */
- protected abstract void save(IPath path, boolean forceSave, IProgressMonitor monitor) throws CoreException;
-
- protected void firePropertyChangeEvent(String propertyName, Object oldValue, Object newValue) {
- configuration.getWorkingCopy().firePropertyChangeEvent(propertyName, oldValue, newValue);
- }
-
- /**
- * Return a string representation of this object.
- * @return java.lang.String
- */
- public String toString() {
- return "TomcatConfiguration[" + this + "]";
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfigurationUtil.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfigurationUtil.java
deleted file mode 100644
index d0b81dd..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfigurationUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.internal;
-
-import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Server;
-/**
- *
- */
-public class TomcatConfigurationUtil {
- public static final int CONFIGURATION_V32 = 0;
- public static final int CONFIGURATION_V40 = 20;
- public static final int CONFIGURATION_V41 = 40;
- public static final int CONFIGURATION_V50 = 60;
- public static final int CONFIGURATION_V55 = 80;
-
- /**
- *
- */
- protected static boolean verifyConfiguration(TomcatConfiguration config, int version) {
- if (version == CONFIGURATION_V32) {
- return config instanceof Tomcat32Configuration;
- }
- Server server = null;
- if (config instanceof Tomcat40Configuration) {
- server = ((Tomcat40Configuration)config).server;
- } else if (config instanceof Tomcat41Configuration) {
- server = ((Tomcat41Configuration)config).server;
- } else if (config instanceof Tomcat50Configuration) {
- server = ((Tomcat50Configuration)config).server;
- } else if (config instanceof Tomcat55Configuration) {
- server = ((Tomcat55Configuration)config).server;
- }
-
- /*if (Tomcat50Configuration.verifyConfiguration(server))
- return (version == CONFIGURATION_V50);
-*/
- if (Tomcat41Configuration.hasMDBListener(server))
- return (version == CONFIGURATION_V41
- || version == CONFIGURATION_V50
- || version == CONFIGURATION_V55);
-
- if (version == CONFIGURATION_V40)
- return true;
-
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatLaunchConfigurationDelegate.java
deleted file mode 100644
index aa25486..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.File;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-/**
- *
- */
-public class TomcatLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
- public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
- String serverId = configuration.getAttribute(IServer.ATTR_SERVER_ID, (String) null);
-
- IServer server = ServerCore.getResourceManager().getServer(serverId);
- if (server == null) {
- Trace.trace(Trace.FINEST, "Launch configuration could not find server");
- // throw CoreException();
- return;
- }
-
- TomcatServer tomcatServer = (TomcatServer) server.getDelegate();
- tomcatServer.setupLaunch(launch, mode, monitor);
-
- String mainTypeName = tomcatServer.getRuntimeClass();
-
- IVMInstall vm = verifyVMInstall(configuration);
-
- IVMRunner runner = vm.getVMRunner(mode);
-
- File workingDir = verifyWorkingDirectory(configuration);
- String workingDirName = null;
- if (workingDir != null)
- workingDirName = workingDir.getAbsolutePath();
-
- // Program & VM args
- String pgmArgs = getProgramArguments(configuration);
- String vmArgs = getVMArguments(configuration);
-
- ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-
- // VM-specific attributes
- Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-
- // Classpath
- String[] classpath = getClasspath(configuration);
-
- // Create VM config
- VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath);
- runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
- runConfig.setVMArguments(execArgs.getVMArgumentsArray());
- runConfig.setWorkingDirectory(workingDirName);
- runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
- // Bootpath
- String[] bootpath = getBootpath(configuration);
- if (bootpath != null && bootpath.length > 0)
- runConfig.setBootClassPath(bootpath);
-
- setDefaultSourceLocator(launch, configuration);
-
- // Launch the configuration
- runner.run(runConfig, launch, monitor);
- tomcatServer.setProcess(launch.getProcesses()[0]);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatLaunchableAdapterDelegate.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatLaunchableAdapterDelegate.java
deleted file mode 100644
index 3407b18..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatLaunchableAdapterDelegate.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.net.URL;
-
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.jst.server.j2ee.Servlet;
-import org.eclipse.jst.server.j2ee.WebResource;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.*;
-import org.eclipse.wst.server.core.util.HttpLaunchable;
-import org.eclipse.wst.server.core.util.NullLaunchable;
-import org.eclipse.wst.server.core.util.NullModuleObject;
-/**
- * Launchable adapter delegate for Web resources in Tomcat.
- */
-public class TomcatLaunchableAdapterDelegate implements ILaunchableAdapterDelegate {
- /*
- * @see ILaunchableAdapterDelegate#getLaunchable(IServer, IModuleObject)
- */
- public ILaunchable getLaunchable(IServer server, IModuleObject moduleObject) {
- Trace.trace("TomcatLaunchableAdapter " + server + "-" + moduleObject);
- IServerDelegate delegate = server.getDelegate();
- if (!(delegate instanceof TomcatServer))
- return null;
- if (!(moduleObject instanceof Servlet) &&
- !(moduleObject instanceof WebResource) &&
- !(moduleObject instanceof NullModuleObject))
- return null;
- if (!(moduleObject.getModule() instanceof IWebModule))
- return null;
-
- try {
- URL url = ((IURLProvider) delegate).getModuleRootURL(moduleObject.getModule());
-
- Trace.trace("root: " + url);
-
- if (moduleObject instanceof Servlet) {
- Servlet servlet = (Servlet) moduleObject;
- if (servlet.getAlias() != null) {
- String path = servlet.getAlias();
- if (path.startsWith("/"))
- path = path.substring(1);
- url = new URL(url, path);
- } else
- url = new URL(url, "servlet/" + servlet.getServletClassName());
- } else if (moduleObject instanceof WebResource) {
- WebResource resource = (WebResource) moduleObject;
- String path = resource.getPath().toString();
- Trace.trace("path: " + path);
- if (path != null && path.startsWith("/") && path.length() > 0)
- path = path.substring(1);
- if (path != null && path.length() > 0)
- url = new URL(url, path);
- } else { // null
- return new NullLaunchable();
- }
- return new HttpLaunchable(url);
- } catch (Exception e) {
- Trace.trace("Error getting URL for " + moduleObject, e);
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatPlugin.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatPlugin.java
deleted file mode 100644
index 7f179b6..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatPlugin.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.File;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-/**
- * The Tomcat plugin.
- */
-public class TomcatPlugin extends Plugin {
- protected static TomcatPlugin singleton;
-
- public static final String PLUGIN_ID = "org.eclipse.jst.server.tomcat.core";
-
- public static final String TOMCAT_32 = "org.eclipse.jst.server.tomcat.32";
- public static final String TOMCAT_40 = "org.eclipse.jst.server.tomcat.40";
- public static final String TOMCAT_41 = "org.eclipse.jst.server.tomcat.41";
- public static final String TOMCAT_50 = "org.eclipse.jst.server.tomcat.50";
- public static final String TOMCAT_55 = "org.eclipse.jst.server.tomcat.55";
-
- protected static final String VERIFY_INSTALL_FILE = "verifyInstall.properties";
- protected static String[] verify32;
- protected static String[] verify40;
- protected static String[] verify41;
- protected static String[] verify50;
- protected static String[] verify55;
-
- /**
- * TomcatPlugin constructor comment.
- */
- public TomcatPlugin() {
- super();
- singleton = this;
- }
-
- /**
- * Returns the singleton instance of this plugin.
- * @return org.eclipse.jst.server.tomcat.internal.TomcatPlugin
- */
- public static TomcatPlugin getInstance() {
- return singleton;
- }
-
- /**
- * Return the install location preference.
- *
- * @param id
- * @return
- */
- public static String getPreference(String id) {
- return getInstance().getPluginPreferences().getString(id);
- }
-
- /**
- * Set the install location preference.
- *
- * @param id
- * @return
- */
- public static void setPreference(String id, String value) {
- getInstance().getPluginPreferences().setValue(id, value);
- getInstance().savePluginPreferences();
- }
-
- /**
- * Convenience method for logging.
- *
- * @param status org.eclipse.core.runtime.IStatus
- */
- public static void log(IStatus status) {
- getInstance().getLog().log(status);
- }
-
- /**
- * Returns the translated String found with the given key.
- * @return java.lang.String
- * @param key java.lang.String
- */
- public static String getResource(String key) {
- try {
- return Platform.getResourceString(getInstance().getBundle(), key);
- } catch (Exception e) {
- return key;
- }
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given object.
- * @return java.lang.String
- * @param key java.lang.String
- * @param obj java.lang.Object[]
- */
- public static String getResource(String key, Object[] obj) {
- try {
- return MessageFormat.format(getResource(key), obj);
- } catch (Exception e) {
- return key;
- }
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given object.
- * @return java.lang.String
- * @param key java.lang.String
- * @param obj java.lang.Object[]
- */
- public static String getResource(String key, String arg) {
- return getResource(key, new String[] { arg });
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given object.
- * @return java.lang.String
- * @param key java.lang.String
- * @param obj java.lang.Object[]
- */
- public static String getResource(String key, String arg1, String arg2) {
- return getResource(key, new String[] { arg1, arg2 });
- }
-
- /**
- * Returns the Tomcat home directory.
- * @return java.lang.String
- */
- protected static String getTomcatStateLocation() {
- try {
- return getInstance().getStateLocation().toOSString();
- } catch (Exception e) {
- return null;
- }
- }
-
- public static ITomcatVersionHandler getTomcatVersionHandler(String id) {
- id = id.substring(0, id.length() - 8);
- if (TOMCAT_32.equals(id))
- return new Tomcat32Handler();
- else if (TOMCAT_40.equals(id))
- return new Tomcat40Handler();
- else if (TOMCAT_41.equals(id))
- return new Tomcat41Handler();
- else if (TOMCAT_50.equals(id))
- return new Tomcat50Handler();
- else if (TOMCAT_55.equals(id))
- return new Tomcat55Handler();
- else
- return null;
- }
-
- /**
- * Returns the file with which to verify the Tomcat installation.
- *
- * @param boolean
- * @return java.lang.String[]
- */
- public static void loadVerifyFiles() {
- if (verify32 != null)
- return;
-
- try {
- URL url = getInstance().getBundle().getEntry(VERIFY_INSTALL_FILE);
- url = Platform.resolve(url);
- Properties p = new Properties();
- p.load(url.openStream());
-
- String verify = p.getProperty("verify32install");
- verify.replace('/', File.separatorChar);
-
- StringTokenizer st = new StringTokenizer(verify, ",");
- List list = new ArrayList();
- while (st.hasMoreTokens())
- list.add(st.nextToken());
- Trace.trace(Trace.FINEST, "Verify32: " + list.toString());
- verify32 = new String[list.size()];
- list.toArray(verify32);
-
- // v4.0
- verify = p.getProperty("verify40install");
- verify.replace('/', File.separatorChar);
-
- st = new StringTokenizer(verify, ",");
- list = new ArrayList();
- while (st.hasMoreTokens())
- list.add(st.nextToken());
- Trace.trace(Trace.FINEST, "Verify40: " + list.toString());
- verify40 = new String[list.size()];
- list.toArray(verify40);
-
- // v4.1
- verify = p.getProperty("verify41install");
- verify.replace('/', File.separatorChar);
-
- st = new StringTokenizer(verify, ",");
- list = new ArrayList();
- while (st.hasMoreTokens())
- list.add(st.nextToken());
- Trace.trace(Trace.FINEST, "Verify41: " + list.toString());
- verify41 = new String[list.size()];
- list.toArray(verify41);
-
- // v5.0
- verify = p.getProperty("verify50install");
- verify.replace('/', File.separatorChar);
-
- st = new StringTokenizer(verify, ",");
- list = new ArrayList();
- while (st.hasMoreTokens())
- list.add(st.nextToken());
- Trace.trace(Trace.FINEST, "Verify50: " + list.toString());
- verify50 = new String[list.size()];
- list.toArray(verify50);
-
- // v5.5
- verify = p.getProperty("verify55install");
- verify.replace('/', File.separatorChar);
-
- st = new StringTokenizer(verify, ",");
- list = new ArrayList();
- while (st.hasMoreTokens())
- list.add(st.nextToken());
- Trace.trace(Trace.FINEST, "Verify55: " + list.toString());
- verify55 = new String[list.size()];
- list.toArray(verify55);
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not load installation verification properties", e);
- verify32 = new String[0];
- verify40 = new String[0];
- verify41 = new String[0];
- verify50 = new String[0];
- verify55 = new String[0];
- }
- }
-
- public static boolean verifyInstallPath(IPath installPath, String id) {
- if (installPath == null)
- return false;
-
- String dir = installPath.toOSString();
- if (!dir.endsWith(File.separator))
- dir += File.separator;
-
- // look for the following files and directories
- TomcatPlugin.loadVerifyFiles();
-
- String[] paths = null;
- if (TOMCAT_32.equals(id))
- paths = verify32;
- else if (TOMCAT_40.equals(id))
- paths = verify40;
- else if (TOMCAT_41.equals(id))
- paths = verify41;
- else if (TOMCAT_50.equals(id))
- paths = verify50;
- else if (TOMCAT_55.equals(id))
- paths = verify55;
- else
- return false;
-
- for (int i = 0; i < paths.length; i++) {
- File temp = new File(dir + paths[i]);
- if (!temp.exists())
- return false;
- }
- return true;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
deleted file mode 100644
index 2f18b9c..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.tomcat.core.ITomcatRuntime;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- *
- */
-public class TomcatRuntime implements ITomcatRuntime {
- protected static final String PROP_VM_INSTALL_TYPE_ID = "vm-install-type-id";
- protected static final String PROP_VM_INSTALL_ID = "vm-install-id";
-
- protected IRuntime runtime;
-
- public TomcatRuntime() { }
-
- public void initialize(IRuntime newRuntime) {
- this.runtime = newRuntime;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IRuntime#getLocation()
- */
- public ITomcatVersionHandler getVersionHandler() {
- IRuntimeType type = runtime.getRuntimeType();
- return TomcatPlugin.getTomcatVersionHandler(type.getId());
- }
-
- public String getVMInstallTypeId() {
- return runtime.getAttribute(PROP_VM_INSTALL_TYPE_ID, (String)null);
- }
-
- public String getVMInstallId() {
- return runtime.getAttribute(PROP_VM_INSTALL_ID, (String)null);
- }
-
- public IVMInstall getVMInstall() {
- try {
- IVMInstallType vmInstallType = JavaRuntime.getVMInstallType(getVMInstallTypeId());
- IVMInstall[] vmInstalls = vmInstallType.getVMInstalls();
- int size = vmInstalls.length;
- String id = getVMInstallId();
- for (int i = 0; i < size; i++) {
- if (id.equals(vmInstalls[i].getId()))
- return vmInstalls[i];
- }
- } catch (Exception e) { }
- return null;
- }
-
- public List getRuntimeClasspath() {
- return getVersionHandler().getRuntimeClasspath(runtime.getLocation());
- }
-
- /**
- * Verifies the Tomcat installation directory. If it is
- * correct, true is returned. Otherwise, the user is notified
- * and false is returned.
- * @return boolean
- */
- public boolean verifyLocation() {
- return getVersionHandler().verifyInstallPath(runtime.getLocation());
- }
-
- public IStatus validate() {
- if (runtime.getName() == null || runtime.getName().length() == 0)
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorRuntimeName"), null);
-
- if (runtime.isWorkingCopy() && ServerUtil.isNameInUse(runtime))
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorDuplicateRuntimeName"), null);
-
- IPath path = runtime.getLocation();
- if (path == null || path.isEmpty())
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, "", null);
- else if (!verifyLocation())
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorInstallDir"), null);
- else if (getVMInstall() == null) {
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorJRE"), null);
- } else
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, "", null);
- }
-
- public void dispose() { }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeLocator.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeLocator.java
deleted file mode 100644
index 8a3d9f5..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeLocator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.File;
-import java.io.FileFilter;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.tomcat.core.ITomcatRuntimeWorkingCopy;
-
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.model.IRuntimeLocatorDelegate;
-import org.eclipse.wst.server.core.model.IRuntimeLocatorListener;
-import org.eclipse.wst.server.core.model.IRuntimeWorkingCopyDelegate;
-/**
- *
- */
-public class TomcatRuntimeLocator implements IRuntimeLocatorDelegate {
- protected static final String[] runtimeTypes = new String[] {
- "org.eclipse.jst.server.tomcat.32.runtime",
- "org.eclipse.jst.server.tomcat.40.runtime",
- "org.eclipse.jst.server.tomcat.41.runtime",
- "org.eclipse.jst.server.tomcat.50.runtime",
- "org.eclipse.jst.server.tomcat.55.runtime"};
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IRuntimeFactoryDelegate#getKnownRuntimes()
- */
- public void searchForRuntimes(IRuntimeLocatorListener listener, IProgressMonitor monitor) {
- File[] files = File.listRoots();
- if (files != null) {
- int size = files.length;
- int work = 100 / size;
- int workLeft = 100 - (work * size);
- for (int i = 0; i < size; i++) {
- if (monitor.isCanceled())
- return;
- if (files[i] != null && files[i].isDirectory())
- searchDir(listener, files[i], 4, monitor);
- monitor.worked(work);
- }
- monitor.worked(workLeft);
- } else
- monitor.worked(100);
- }
-
- protected void searchDir(IRuntimeLocatorListener listener, File dir, int depth, IProgressMonitor monitor) {
- if ("conf".equals(dir.getName())) {
- IRuntimeWorkingCopy runtime = getRuntimeFromDir(dir.getParentFile());
- if (runtime != null) {
- listener.runtimeFound(runtime);
- return;
- }
- }
-
- if (depth == 0)
- return;
-
- File[] files = dir.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.isDirectory();
- }
- });
- if (files != null) {
- int size = files.length;
- for (int i = 0; i < size; i++) {
- if (monitor.isCanceled())
- return;
- searchDir(listener, files[i], depth - 1, monitor);
- }
- }
- }
-
- protected IRuntimeWorkingCopy getRuntimeFromDir(File dir) {
- for (int i = 0; i < runtimeTypes.length; i++) {
- try {
- IRuntimeType runtimeType = ServerCore.getRuntimeType(runtimeTypes[i]);
- IRuntimeWorkingCopy runtime = runtimeType.createRuntime(dir.getAbsolutePath());
- runtime.setName(dir.getName());
- runtime.setLocation(new Path(dir.getAbsolutePath()));
- IRuntimeWorkingCopyDelegate delegate = runtime.getWorkingCopyDelegate();
- ITomcatRuntimeWorkingCopy wc = (ITomcatRuntimeWorkingCopy) delegate;
- IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
- wc.setVMInstall(vmInstall.getVMInstallType().getId(), vmInstall.getId());
- IStatus status = wc.validate();
- if (status == null || status.isOK())
- return runtime;
-
- Trace.trace(Trace.FINER, "False runtime found at " + dir.getAbsolutePath() + ": " + status.getMessage());
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not find runtime", e);
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeTargetHandler.java
deleted file mode 100644
index 90b9d93..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeTargetHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.core.ClasspathRuntimeTargetHandler;
-import org.eclipse.jst.server.tomcat.core.ITomcatRuntime;
-
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public abstract class TomcatRuntimeTargetHandler extends ClasspathRuntimeTargetHandler {
- public IClasspathEntry[] getDelegateClasspathEntries(IRuntime runtime) {
- ITomcatRuntime tomcatRuntime = (ITomcatRuntime) runtime.getDelegate();
- IVMInstall vmInstall = tomcatRuntime.getVMInstall();
- if (vmInstall != null) {
- String name = vmInstall.getName();
- return new IClasspathEntry[] { JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER).append("org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType").append(name)) };
- }
- return null;
- }
-
- public String[] getClasspathEntryIds(IRuntime runtime) {
- return new String[1];
- }
-
- public String getClasspathContainerLabel(IRuntime runtime, String id) {
- return getLabel();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.target.IServerTargetDelegate#getClasspathEntries()
- */
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime, String id) {
- return resolveClasspathContainer(runtime);
- }
-
- public abstract String getLabel();
-
- public abstract IClasspathEntry[] resolveClasspathContainer(IRuntime runtime);
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeWorkingCopy.java
deleted file mode 100644
index 70616fd..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeWorkingCopy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.tomcat.core.ITomcatRuntimeWorkingCopy;
-
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-/**
- *
- */
-public class TomcatRuntimeWorkingCopy extends TomcatRuntime implements ITomcatRuntimeWorkingCopy {
- protected IRuntimeWorkingCopy wc;
-
- public void initialize(IRuntimeWorkingCopy runtime2) {
- wc = runtime2;
- }
-
- public void setDefaults() {
- IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
- setVMInstall(vmInstall.getVMInstallType().getId(), vmInstall.getId());
-
- IRuntimeType type = wc.getRuntimeType();
- wc.setLocation(new Path(TomcatPlugin.getPreference("location" + type.getId())));
- }
-
- public void setVMInstall(String typeId, String id) {
- if (typeId == null)
- wc.setAttribute(PROP_VM_INSTALL_TYPE_ID, (String)null);
- else
- wc.setAttribute(PROP_VM_INSTALL_TYPE_ID, typeId);
-
- if (id == null)
- wc.setAttribute(PROP_VM_INSTALL_ID, (String)null);
- else
- wc.setAttribute(PROP_VM_INSTALL_ID, id);
- }
-
- public void handleSave(byte id, IProgressMonitor monitor) { }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
deleted file mode 100644
index 93b6f45..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
+++ /dev/null
@@ -1,661 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.internal;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.ITomcatRuntime;
-import org.eclipse.jst.server.tomcat.core.ITomcatServer;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.command.RemoveWebModuleTask;
-import org.eclipse.jst.server.tomcat.core.internal.command.SetWebModulePathTask;
-
-import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.model.*;
-import org.eclipse.wst.server.core.resources.IModuleResourceDelta;
-import org.eclipse.wst.server.core.util.SocketUtil;
-/**
- * Generic Tomcat server.
- */
-public class TomcatServer implements ITomcatServer, IStartableServer, IMonitorableServer {
- private static final String ATTR_STOP = "stop-server";
-
- protected transient IPath tempDirectory;
-
- protected IServerState server;
-
- // the thread used to ping the server to check for startup
- protected transient PingThread ping = null;
- protected transient IProcess process;
- protected transient IDebugEventSetListener processListener;
-
- /**
- * TomcatServer.
- */
- public TomcatServer() {
- super();
- }
-
- public void initialize(IServerState server2) {
- this.server = server2;
- }
-
- public void dispose() { }
-
- public TomcatRuntime getTomcatRuntime() {
- if (server.getRuntime() == null)
- return null;
-
- return (TomcatRuntime) server.getRuntime().getDelegate();
- }
-
- public ITomcatVersionHandler getTomcatVersionHandler() {
- if (server.getRuntime() == null)
- return null;
-
- TomcatRuntime runtime = (TomcatRuntime) server.getRuntime().getDelegate();
- return runtime.getVersionHandler();
- }
-
- public TomcatConfiguration getTomcatConfiguration() {
- IServerConfiguration configuration = server.getServerConfiguration();
- if (configuration == null)
- return null;
-
- return (TomcatConfiguration) configuration.getDelegate();
- }
-
- /**
- * Returns the project publisher that can be used to
- * publish the given project.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return org.eclipse.wst.server.core.model.IProjectPublisher
- */
- public IPublisher getPublisher(List parents, IModule module) {
- if (isTestEnvironment())
- return null;
-
- return new TomcatWebModulePublisher((IWebModule) module, server.getRuntime().getLocation());
- }
-
- /**
- * Return the root URL of this module.
- * @param module org.eclipse.wst.server.core.model.IModule
- * @return java.net.URL
- */
- public URL getModuleRootURL(IModule module) {
- try {
- if (module == null || !(module instanceof IWebModule))
- return null;
-
- IServerConfiguration serverConfig = server.getServerConfiguration();
- if (serverConfig == null)
- return null;
-
- TomcatConfiguration config = (TomcatConfiguration) serverConfig.getDelegate();
- if (config == null)
- return null;
-
- String url = "http://localhost";
- int port = config.getMainPort().getPort();
- port = ServerCore.getServerMonitorManager().getMonitoredPort(server, port, "web");
- if (port != 80)
- url += ":" + port;
-
- IWebModule module2 = (IWebModule) module;
- url += config.getWebModuleURL(module2);
-
- if (!url.endsWith("/"))
- url += "/";
-
- return new URL(url);
- } catch (Exception e) {
- Trace.trace("Could not get root URL", e);
- return null;
- }
- }
-
- /**
- * Return the runtime class name.
- *
- * @return java.lang.String
- */
- public String getRuntimeClass() {
- return getTomcatVersionHandler().getRuntimeClass();
- }
-
- /**
- * Return the program's runtime arguments to start or stop.
- *
- * @param boolean starting
- * @return java.lang.String
- */
- protected String[] getRuntimeProgramArguments(boolean starting) {
- IPath configPath = null;
- if (isTestEnvironment())
- configPath = getTempDirectory();
- return getTomcatVersionHandler().getRuntimeProgramArguments(configPath, isDebug(), starting);
- }
-
- /**
- * Return the runtime (VM) arguments.
- *
- * @return java.lang.String
- */
- protected String[] getRuntimeVMArguments() {
- IPath configPath = null;
- if (isTestEnvironment())
- configPath = getTempDirectory();
- return getTomcatVersionHandler().getRuntimeVMArguments(server.getRuntime().getLocation(), configPath, isSecure());
- }
-
- /**
- * Obtain a temporary directory if this server doesn't
- * already have one. Otherwise, return the existing one.
- * @return java.io.File
- */
- public IPath getTempDirectory() {
- if (tempDirectory == null)
- tempDirectory = server.getTempDirectory();
- return tempDirectory;
- }
-
- /**
- * Returns true if the process is set to run in debug mode.
- * This feature only works with Tomcat v4.0.
- *
- * @return boolean
- */
- public boolean isDebug() {
- return server.getAttribute(PROPERTY_DEBUG, false);
- }
-
- /**
- * Returns true if this is a test (run code out of the workbench) server.
- *
- * @return boolean
- */
- public boolean isTestEnvironment() {
- return server.getAttribute(PROPERTY_TEST_ENVIRONMENT, false);
- }
-
- /**
- * Returns true if the process is set to run in secure mode.
- *
- * @return boolean
- */
- public boolean isSecure() {
- return server.getAttribute(PROPERTY_SECURE, false);
- }
-
- protected static String renderCommandLine(String[] commandLine, String separator) {
- if (commandLine == null || commandLine.length < 1)
- return "";
- StringBuffer buf= new StringBuffer(commandLine[0]);
- for (int i = 1; i < commandLine.length; i++) {
- buf.append(separator);
- buf.append(commandLine[i]);
- }
- return buf.toString();
- }
-
- public void setProcess(final IProcess newProcess) {
- if (process != null)
- return;
-
- process = newProcess;
- processListener = new IDebugEventSetListener() {
- public void handleDebugEvents(DebugEvent[] events) {
- if (events != null) {
- int size = events.length;
- for (int i = 0; i < size; i++) {
- if (process.equals(events[i].getSource()) && events[i].getKind() == DebugEvent.TERMINATE) {
- DebugPlugin.getDefault().removeDebugEventListener(this);
- stopImpl();
- }
- }
- }
- }
- };
- DebugPlugin.getDefault().addDebugEventListener(processListener);
- }
-
- protected void stopImpl() {
- if (ping != null) {
- ping.stopPinging();
- ping = null;
- }
- if (process != null) {
- process = null;
- DebugPlugin.getDefault().removeDebugEventListener(processListener);
- processListener = null;
- }
- server.setServerState(IServer.SERVER_STOPPED);
- }
-
- /**
- * Methods called to notify that publishing is about to begin.
- * This allows the server to open a connection to the server
- * or get any global information ready.
- *
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- */
- public IStatus publishStart(IProgressMonitor monitor) {
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%publishingStarted"), null);
- }
-
- public IStatus publishConfiguration(IProgressMonitor monitor) {
- IPath confDir = null;
- if (isTestEnvironment()) {
- confDir = getTempDirectory();
- File temp = confDir.append("conf").toFile();
- if (!temp.exists())
- temp.mkdirs();
- } else
- confDir = server.getRuntime().getLocation();
- return getTomcatConfiguration().backupAndPublish(confDir, !isTestEnvironment(), monitor);
- }
-
- /**
- * Methods called to notify that publishing has finished.
- * The server can close any open connections to the server
- * and do any cleanup operations.
- *
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- */
- public IStatus publishStop(IProgressMonitor monitor) {
- server.setConfigurationSyncState(IServer.SYNC_STATE_IN_SYNC);
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%publishingStopped"), null);
- }
-
- /**
- * Return true if the server should be terminated before the workbench
- * shutdown and false if not. If the server is not terminated when
- * workbench shutdown, then the server should get reconnected
- * in the server load when the workbench startsup.
- *
- * @return boolean
- **/
- public boolean isTerminateOnShutdown() {
- return true;
- }
-
- /**
- * Setup for starting the server.
- *
- * @param launch ILaunch
- * @param launchMode String
- * @param monitor IProgressMonitor
- */
- public void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException {
- if ("true".equals(launch.getLaunchConfiguration().getAttribute(ATTR_STOP, "false")))
- return;
- IStatus status = getTomcatRuntime().validate();
- if (status != null && !status.isOK())
- throw new CoreException(status);
-
- //setRestartNeeded(false);
- TomcatConfiguration configuration = getTomcatConfiguration();
-
- // check that ports are free
- Iterator iterator = configuration.getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort sp = (IServerPort) iterator.next();
- if (SocketUtil.isPortInUse(sp.getPort(), 5))
- throw new CoreException(new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorPortInUse", new String[] {sp.getPort() + "", sp.getName()}), null));
- }
-
- server.setServerState(IServer.SERVER_STARTING);
-
- // ping server to check for startup
- try {
- String url = "http://localhost";
- int port = configuration.getMainPort().getPort();
- if (port != 80)
- url += ":" + port;
- ping = new PingThread(this, server, url, launchMode);
- ping.start();
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Can't ping for Tomcat startup.");
- }
- }
-
- /**
- * Cleanly shuts down and terminates the server.
- */
- public void stop() {
- byte state = server.getServerState();
- if (state == IServer.SERVER_STOPPED)
- return;
- else if (state == IServer.SERVER_STARTING || state == IServer.SERVER_STOPPING) {
- terminate();
- return;
- }
-
- try {
- Trace.trace(Trace.FINER, "Stopping Tomcat");
- if (state != IServer.SERVER_STOPPED)
- server.setServerState(IServer.SERVER_STOPPING);
-
- ILaunchConfiguration launchConfig = server.getLaunchConfiguration(true);
- ILaunchConfigurationWorkingCopy wc = launchConfig.getWorkingCopy();
-
- String args = renderCommandLine(getRuntimeProgramArguments(false), " ");
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args);
- wc.setAttribute(ATTR_STOP, "true");
- wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error stopping Tomcat", e);
- }
- }
-
- /**
- * Terminates the server.
- */
- public void terminate() {
- if (server.getServerState() == IServer.SERVER_STOPPED)
- return;
-
- try {
- server.setServerState(IServer.SERVER_STOPPING);
- Trace.trace(Trace.FINER, "Killing the Tomcat process");
- if (process != null && !process.isTerminated()) {
- process.terminate();
- stopImpl();
- }
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error killing the process", e);
- }
- }
-
- public int getStartTimeout() {
- return 45000;
- }
-
- public int getStopTimeout() {
- return 10000;
- }
-
- /**
- * Return a string representation of this object.
- * @return java.lang.String
- */
- public String toString() {
- return "TomcatServer";
- }
-
- /**
- * Update the given configuration in the server.
- * (i.e. publish any changes to the server, and restart if necessary)
- * @param config org.eclipse.wst.server.core.model.IServerConfiguration
- */
- public void updateConfiguration() {
- Trace.trace(Trace.FINEST, "Configuration updated " + this);
- //setConfigurationSyncState(SYNC_STATE_DIRTY);
- //setRestartNeeded(true);
- }
-
- /**
- * Respond to updates within the project tree.
- */
- public void updateModule(final IModule module, IModuleResourceDelta delta) { }
-
- public void setLaunchDefaults(ILaunchConfigurationWorkingCopy workingCopy) {
- ITomcatRuntime runtime = getTomcatRuntime();
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, runtime.getVMInstallTypeId());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, runtime.getVMInstall().getName());
-
- String[] args = getRuntimeProgramArguments(true);
- String args2 = renderCommandLine(args, " ");
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args2);
-
- args = getRuntimeVMArguments();
- args2 = renderCommandLine(args, " ");
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, args2);
-
- List cp = runtime.getRuntimeClasspath();
-
- // add tools.jar to the path
- IVMInstall vmInstall = runtime.getVMInstall();
- if (vmInstall != null) {
- try {
- cp.add(JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER).append("org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType").append(vmInstall.getName()), IRuntimeClasspathEntry.BOOTSTRAP_CLASSES));
- } catch (Exception e) { }
-
- IPath jrePath = new Path(vmInstall.getInstallLocation().getAbsolutePath());
- if (jrePath != null) {
- IPath toolsPath = jrePath.append("lib").append("tools.jar");
- if (toolsPath.toFile().exists()) {
- cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(toolsPath));
- }
- }
- }
-
- Iterator cpi = cp.iterator();
- List list = new ArrayList();
- while (cpi.hasNext()) {
- IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry) cpi.next();
- try {
- list.add(entry.getMemento());
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not resolve classpath entry: " + entry, e);
- }
- }
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, list);
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
- }
-
- /**
- * Returns the child project(s) of this project. If this
- * project contains other projects, it should list those
- * projects. If not, it should return an empty list.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return java.util.List
- */
- public List getChildModules(IModule project) {
- return new ArrayList(0);
- }
-
- /**
- * Returns the parent project(s) of this project. When
- * determining if a given project can run on a server
- * configuration, this method will be used to find the
- * actual project that will be run on the server. For
- * instance, a Web project may return a list of Ear projects
- * that it is contained in if the server only supports Ear
- * projects.
- *
- * <p>If the given project will directly run on the server,
- * it should just be returned.</p>
- *
- * @param project org.eclipse.core.resources.IProject
- * @return java.util.List
- */
- public List getParentModules(IModule module) throws CoreException {
- if (module instanceof IWebModule) {
- IWebModule webModule = (IWebModule) module;
- IStatus status = canModifyModules(new IModule[] { module }, null);
- if (status == null || !status.isOK())
- throw new CoreException(status);
- ArrayList l = new ArrayList();
- l.add(webModule);
- return l;
- }
- return null;
- }
-
- /**
- * Returns the project references for projects that are in
- * this configuration.
- *
- * @return java.lang.String[]
- */
- public IModule[] getModules() {
- List list = new ArrayList();
-
- ITomcatConfiguration config = getTomcatConfiguration();
- if (config != null) {
- List modules = config.getWebModules();
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
-
- String memento = module.getMemento();
- if (memento != null) {
- int index = memento.indexOf(":");
- if (index > 0) {
- String factoryId = memento.substring(0, index);
- String mem = memento.substring(index + 1);
- IModule module2 = ServerUtil.getModule(factoryId, mem);
- if (module2 != null)
- list.add(module2);
- }
- }
- }
- }
-
- IModule[] s = new IModule[list.size()];
- list.toArray(s);
-
- return s;
- }
-
- public byte getModuleState(IModule module) {
- return IServer.MODULE_STATE_STARTED;
- }
-
- /**
- * Returns true if the given project is supported by this
- * server, and false otherwise.
- *
- * @param project org.eclipse.core.resources.IProject
- * @return boolean
- */
- public IStatus canModifyModules(IModule[] add, IModule[] remove) {
- if (add != null) {
- int size = add.length;
- for (int i = 0; i < size; i++) {
- IModule module = add[i];
- if (!(module instanceof IWebModule))
- return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorWebModulesOnly"), null);
-
- IStatus status = getTomcatVersionHandler().canAddModule((IWebModule) module);
- if (status != null && !status.isOK())
- return status;
- }
- }
-
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, "%canModifyModules", null);
- }
-
- /**
- * Method called when changes to the modules or module factories
- * within this configuration occur. Return any necessary commands to repair
- * or modify the server configuration in response to these changes.
- *
- * @param org.eclipse.wst.server.core.model.IModuleFactoryEvent[]
- * @param org.eclipse.wst.server.core.model.IModuleEvent[]
- * @return org.eclipse.wst.server.core.model.ITask[]
- */
- public ITask[] getRepairCommands(IModuleFactoryEvent[] factoryEvent, IModuleEvent[] moduleEvent) {
- List list = new ArrayList();
- // check for Web modules being removed
- if (factoryEvent != null) {
- List modules = getTomcatConfiguration().getWebModules();
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
-
- String memento = module.getMemento();
- if (memento != null) {
- boolean found = false;
- int index = memento.indexOf(":");
- String factoryId = memento.substring(0, index);
- String mem = memento.substring(index + 1);
-
- int size2 = factoryEvent.length;
- for (int j = 0; !found && j < size2; j++) {
- IModule[] removed = factoryEvent[j].getRemovedModules();
- if (removed != null) {
- int size3 = removed.length;
- for (int k = 0; !found && k < size3; k++) {
- if (removed[k] != null && removed[k].getFactoryId().equals(factoryId) &&
- removed[k].getId().equals(mem)) {
- list.add(new RemoveWebModuleTask(i));
- found = true;
- }
- }
- }
- }
- }
- }
- }
-
- // check for changing context roots
- if (moduleEvent != null) {
- int size2 = moduleEvent.length;
- for (int j = 0; j < size2; j++) {
- if (moduleEvent[j].getModule() instanceof IWebModule && moduleEvent[j].isChanged()) {
- IWebModule webModule = (IWebModule) moduleEvent[j].getModule();
-
- String contextRoot = webModule.getContextRoot();
- if (contextRoot != null && !contextRoot.startsWith("/"))
- contextRoot = "/" + contextRoot;
-
- List modules = getTomcatConfiguration().getWebModules();
- int size = modules.size();
- boolean found = false;
- for (int i = 0; !found && i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
-
- String memento = module.getMemento();
- if (memento != null) {
- int index = memento.indexOf(":");
- String factoryId = memento.substring(0, index);
- String mem = memento.substring(index + 1);
- if (webModule.getFactoryId().equals(factoryId) && webModule.getId().equals(mem)) {
- if (!module.getPath().equals(contextRoot)) {
- list.add(new SetWebModulePathTask(i, contextRoot));
- found = true;
- }
- }
- }
- }
- }
- }
- }
-
- ITask[] commands = new ITask[list.size()];
- list.toArray(commands);
- return commands;
- }
-
- public List getServerPorts() {
- if (server.getServerConfiguration() == null)
- return new ArrayList();
- return getTomcatConfiguration().getServerPorts();
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerLocator.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerLocator.java
deleted file mode 100644
index 6f2388f..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerLocator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.model.IRuntimeLocatorListener;
-import org.eclipse.wst.server.core.model.IServerLocatorDelegate;
-import org.eclipse.wst.server.core.model.IServerLocatorListener;
-/**
- *
- */
-public class TomcatServerLocator extends TomcatRuntimeLocator implements IServerLocatorDelegate {
- /*protected static final String[] serverTypes = new String[] {
- "org.eclipse.jst.server.tomcat.32",
- "org.eclipse.jst.server.tomcat.40",
- "org.eclipse.jst.server.tomcat.41",
- "org.eclipse.jst.server.tomcat.50"};*/
-
- public void searchForServers(final IServerLocatorListener listener, IProgressMonitor monitor) {
- IRuntimeLocatorListener listener2 = new IRuntimeLocatorListener() {
- public void runtimeFound(IRuntime runtime) {
- String runtimeTypeId = runtime.getRuntimeType().getId();
- String serverTypeId = runtimeTypeId.substring(0, runtimeTypeId.length() - 8);
- IServerType serverType = ServerCore.getServerType(serverTypeId);
- try {
- IServer server = serverType.createServer(serverTypeId, null, runtime);
- listener.serverFound(server);
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not create Tomcat server", e);
- }
- }
- };
- searchForRuntimes(listener2, monitor);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerUtil.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerUtil.java
deleted file mode 100644
index 5e0f98b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerUtil.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-/**
- * Helper class to load and save Tomcat server and identify configurations.
- */
-public class TomcatServerUtil {
- /**
- * TomcatServerSerializer constructor comment.
- */
- protected TomcatServerUtil() {
- super();
- }
-
- /**
- * Returns the kind of a <code>PackageFragmentRoot</code> from its <code>String</code> form.
- */
- protected static int getClasspathKindFromString(String kindStr) {
- //if (kindStr.equalsIgnoreCase("prj"))
- // return IClasspathEntry.CPE_PROJECT;
- if (kindStr.equalsIgnoreCase("var"))
- return IClasspathEntry.CPE_VARIABLE;
- //if (kindStr.equalsIgnoreCase("src"))
- // return IClasspathEntry.CPE_SOURCE;
- if (kindStr.equalsIgnoreCase("lib"))
- return IClasspathEntry.CPE_LIBRARY;
- return -1;
- }
-
- /**
- * Returns a <code>String</code> for the kind of a class path entry.
- */
- protected static String getClasspathKindToString(int kind) {
- switch (kind) {
- //case IClasspathEntry.CPE_PROJECT :
- // return "prj";
- //case IClasspathEntry.CPE_SOURCE :
- // return "src";
- case IClasspathEntry.CPE_LIBRARY :
- return "lib";
- case IClasspathEntry.CPE_VARIABLE :
- return "var";
- default :
- return "unknown";
- }
- }
-
- /**
- * Create's a classpath entry of the specified kind.
- *
- * Returns null if unable to create a valid entry.
- */
- protected static IClasspathEntry createClasspathEntry(IPath path, int kind, IPath sourceAttachmentPath, IPath sourceAttachmentRootPath) {
- switch (kind) {
- /*case IClasspathEntry.CPE_PROJECT:
- if (!path.isAbsolute())
- return null;
- else
- return JavaCore.newProjectEntry(path);*/
-
- case IClasspathEntry.CPE_LIBRARY:
- if (!path.isAbsolute())
- return null;
-
- return JavaCore.newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath);
-
- case IClasspathEntry.CPE_VARIABLE:
- return JavaCore.newVariableEntry(path, sourceAttachmentPath, sourceAttachmentRootPath);
-
- default:
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerWorkingCopy.java
deleted file mode 100644
index 6a2f595..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerWorkingCopy.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.List;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.ITomcatServerWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.model.IModule;
-/**
- *
- */
-public class TomcatServerWorkingCopy extends TomcatServer implements ITomcatServerWorkingCopy {
- protected IServerWorkingCopy workingCopy;
-
- public TomcatServerWorkingCopy() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.model.IServerWorkingCopyDelegate#initializeWorkingCopy(org.eclipse.wst.server.core.IServerWorkingCopy)
- */
- public void initialize(IServerWorkingCopy workingCopy2) {
- this.workingCopy = workingCopy2;
- }
-
- public void setDefaults() {
- setTestEnvironment(true);
- }
-
- /**
- * Sets this process to debug mode. This feature only works
- * with Tomcat v4.0.
- *
- * @param b boolean
- */
- public void setDebug(boolean b) {
- workingCopy.setAttribute(PROPERTY_DEBUG, b);
- }
-
- /**
- * Sets this process to secure mode.
- * @param b boolean
- */
- public void setSecure(boolean b) {
- workingCopy.setAttribute(PROPERTY_SECURE, b);
- }
-
- /**
- * Sets this server to test environment mode.
- *
- * @param b boolean
- */
- public void setTestEnvironment(boolean b) {
- workingCopy.setAttribute(PROPERTY_TEST_ENVIRONMENT, b);
- }
-
- /**
- * Add the given project to this configuration. The project
- * has already been verified using isSupportedProject() and
- * does not already exist in the configuration.
- *
- * @param ref java.lang.String
- */
- public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException {
- IStatus status = canModifyModules(add, remove);
- if (status == null || !status.isOK())
- throw new CoreException(status);
-
- IServerConfigurationWorkingCopy scwc = server.getServerConfiguration().getWorkingCopy();
- // TODO
- ITomcatConfigurationWorkingCopy wc = (ITomcatConfigurationWorkingCopy) scwc.getWorkingCopyDelegate();
- boolean change = false;
-
- if (add != null) {
- int size = add.length;
- for (int i = 0; i < size; i++) {
- IModule module3 = add[i];
- IWebModule module = (IWebModule) module3;
- String contextRoot = module.getContextRoot();
- if (contextRoot != null && !contextRoot.startsWith("/"))
- contextRoot = "/" + contextRoot;
- WebModule module2 = new WebModule(contextRoot,
- module.getLocation().toOSString(), module.getFactoryId() + ":" + module.getId(), true);
- wc.addWebModule(-1, module2);
- change = true;
- }
- }
-
- if (remove != null) {
- int size2 = remove.length;
- for (int j = 0; j < size2; j++) {
- IModule module3 = remove[j];
- String memento = module3.getFactoryId() + ":" + module3.getId();
- List modules = getTomcatConfiguration().getWebModules();
- int size = modules.size();
- for (int i = 0; i < size; i++) {
- WebModule module = (WebModule) modules.get(i);
- if (memento.equals(module.getMemento())) {
- wc.removeWebModule(i);
- change = true;
- }
- }
- }
- }
- if (!change)
- scwc.release();
- else
- scwc.save(new NullProgressMonitor());
- server.setConfigurationSyncState(IServer.SYNC_STATE_DIRTY);
- }
-
- public void handleSave(byte id, IProgressMonitor monitor) { }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatSourcePathComputerDelegate.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatSourcePathComputerDelegate.java
deleted file mode 100644
index a299b6e..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatSourcePathComputerDelegate.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupUtil;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.core.model.IProjectModule;
-/**
- *
- */
-public class TomcatSourcePathComputerDelegate implements ISourcePathComputerDelegate {
- /* (non-Javadoc)
- * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
- */
- public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
- IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
-
- String serverId = configuration.getAttribute(IServer.ATTR_SERVER_ID, (String) null);
-
- IServer server = ServerCore.getResourceManager().getServer(serverId);
- if (server != null) {
- List list = new ArrayList();
- List pathList = new ArrayList();
- IModule[] modules = server.getModules();
- for (int i = 0; i < modules.length; i++) {
- if (modules[i] instanceof IProjectModule) {
- IProjectModule dp = (IProjectModule) modules[i];
- IProject project = dp.getProject();
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- list.add(javaProject);
- }
- } catch (Exception e) { }
-
- IPath path = server.getRuntime().getLocation().append("work").append("Catalina").append("localhost").append(modules[i].getName());
- pathList.add(path);
- }
- }
- int size = list.size();
- IJavaProject[] projects = new IJavaProject[size];
- list.toArray(projects);
-
- int size2 = entries.length;
- int size3 = pathList.size();
- IRuntimeClasspathEntry[] entries2 = new IRuntimeClasspathEntry[size + size2 + size3];
- System.arraycopy(entries, 0, entries2, 0, size2);
-
- for (int i = 0; i < size; i++) {
- entries2[size2 + i] = JavaRuntime.newProjectRuntimeClasspathEntry(projects[i]);
- }
-
- for (int i = 0; i < size3; i++) {
- entries2[size + size2 + i] = JavaRuntime.newArchiveRuntimeClasspathEntry((IPath) pathList.get(i));
- }
-
- entries = entries2;
- }
-
- IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
- return JavaSourceLookupUtil.translate(resolved, true);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatWebModulePublisher.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatWebModulePublisher.java
deleted file mode 100644
index 705f24f..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatWebModulePublisher.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.j2ee.IWebModule;
-
-import org.eclipse.wst.server.core.model.IPublisher;
-import org.eclipse.wst.server.core.resources.IModuleFile;
-import org.eclipse.wst.server.core.resources.IModuleFolder;
-import org.eclipse.wst.server.core.resources.IModuleResource;
-import org.eclipse.wst.server.core.resources.IRemoteResource;
-import org.eclipse.wst.server.core.resources.RemoteFolder;
-import org.eclipse.wst.server.core.resources.RemoteResource;
-import org.eclipse.wst.server.core.util.FileUtil;
-import org.eclipse.wst.server.core.util.ProgressUtil;
-/**
- * The Tomcat publisher for local (out of the workbench) resources.
- */
-public class TomcatWebModulePublisher implements IPublisher {
- protected IWebModule module;
- protected IPath installDir;
-
- protected static final Status publishStatus = new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, "Published successfully", null);
- protected static final Status deleteStatus = new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, "Deleted successfully", null);
-
- /**
- * TomcatWebModulePublisher constructor comment.
- */
- public TomcatWebModulePublisher(IWebModule module, IPath installDir) {
- super();
- this.module = module;
- this.installDir = installDir;
- }
-
- /**
- * Delete the following files from the remote machine.
- *
- * @param file java.lang.String[]
- * @return org.eclipse.core.runtime.IStatus[]
- */
- public IStatus[] delete(IRemoteResource[] resource, IProgressMonitor monitor) {
- if (resource == null)
- return null;
-
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%publishTask"), resource.length);
-
- IPath root = getRemoteRoot().append(module.getContextRoot());
-
- int size = resource.length;
- IStatus[] status = new Status[size];
- for (int i = 0; i < size; i++) {
- if (monitor.isCanceled())
- return status;
-
- IPath path = resource[i].getPath();
- IPath realPath = root.append(path);
- File file = new File(realPath.toOSString());
-
- monitor.subTask(TomcatPlugin.getResource("%publisherDeleteTask", new String[] {path.toString()}));
- Trace.trace("Deleting " + realPath);
- boolean b = file.delete();
- if (b)
- status[i] = new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, "Delete " + realPath.toOSString() + " successfully", null);
- else
- status[i] = new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, "Could not delete " + realPath.toOSString(), null);
-
- monitor.worked(1);
- }
- monitor.done();
- return status;
- }
-
- /**
- * Returns the mapping of this file on the remote
- * system. Return null if this file should not be
- * copied to the remote server.
- *
- * @param resource org.eclipse.core.resources.IResource
- * @return org.eclipse.core.resources.IPath
- */
- public IPath getMappedLocation(IModuleResource resource) {
- return resource.getPath();
- }
-
- /**
- * Recursively builds a directory tree of the remote resources.
- *
- * @param path org.eclipse.core.runtime.IPath
- * @return java.util.List
- */
- protected IRemoteResource[] getRemoteResources(RemoteFolder parent, File dir) {
- List list = new ArrayList();
-
- if (!dir.exists())
- return null;
-
- if (!dir.isDirectory())
- return null;
-
- File[] files = dir.listFiles();
- if (files == null)
- return null;
-
- int size = files.length;
- for (int i = 0; i < size; i++) {
- File file = files[i];
- if (file.isDirectory()) {
- RemoteFolder folder = new RemoteFolder(parent, file.getName(), file.lastModified());
- if (parent != null)
- parent.addChild(folder);
- getRemoteResources(folder, file);
- list.add(folder);
- } else {
- IRemoteResource remote = new RemoteResource(parent, file.getName(), file.lastModified());
- if (parent != null)
- parent.addChild(remote);
- list.add(remote);
- }
- }
-
- IRemoteResource[] resources = new IRemoteResource[list.size()];
- list.toArray(resources);
- return resources;
- }
-
- /**
- * Returns a list of the remote resources at the root level.
- * These may be folders or resources. This method should not
- * return cached data.
- *
- * @return java.util.List
- */
- public IRemoteResource[] getRemoteResources(IProgressMonitor monitor) {
- File rootFile = getRemoteRoot().append(module.getContextRoot()).toFile();
- if (rootFile.exists()) {
- return getRemoteResources(null, rootFile);
- }
- return new IRemoteResource[0];
- }
-
- /**
- * Returns the root of the remote publishing location.
- *
- * @return org.eclipse.core.runtime.IPath
- */
- protected IPath getRemoteRoot() {
- return installDir.append("webapps");
- }
-
- /**
- * Returns true if there may be any files or folders within
- * this container that should be mapped to the remote system.
- * Returns false if files within this folder are never copied
- * to the remote system.
- *
- * @param container org.eclipse.core.resources.IContainer
- * @return boolean
- */
- public boolean shouldMapMembers(IModuleFolder folder) {
- return true;
- }
-
- /**
- * Publish the given files to the given location on the
- * remote machine.
- *
- * @param file java.lang.String[]
- * @return org.eclipse.core.runtime.IStatus[]
- */
- public IStatus[] publish(IModuleResource[] resource, IProgressMonitor monitor) {
- if (resource == null)
- return null;
-
- monitor = ProgressUtil.getMonitorFor(monitor);
- monitor.beginTask(TomcatPlugin.getResource("%publishTask"), resource.length);
-
- IPath root = getRemoteRoot().append(module.getContextRoot());
-
- // create context root directory if necessary
- File temp = root.toFile();
- if (!temp.exists())
- temp.mkdirs();
-
- int size = resource.length;
- IStatus[] status = new Status[size];
- for (int i = 0; i < size; i++) {
- if (monitor.isCanceled())
- return status;
-
- //IPath fromPath = resource[i].getLocation();
- IPath toPath = getMappedLocation(resource[i]);
- IPath realToPath = root.append(toPath);
-
- // copy file
- monitor.subTask(TomcatPlugin.getResource("%publisherPublishTask", new String[] {toPath.toString()}));
- Trace.trace("Publishing " + resource[i] + " -> " + realToPath);
- if (resource[i] instanceof IModuleFolder) {
- File f = new File(realToPath.toOSString());
- if (f.exists() && f.isDirectory()) {
- status[i] = new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, "Directory " + realToPath.toOSString() + " already exists", null);
- } else {
- boolean b = f.mkdir();
-
- if (b)
- status[i] = new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, "Created " + realToPath.toOSString() + " successfully", null);
- else
- status[i] = new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, "Could not create directory " + realToPath.toOSString(), null);
- }
- } else if (resource[i] instanceof IModuleFile) {
- IModuleFile file = (IModuleFile) resource[i];
- InputStream in = null;
- try {
- in = file.getContents();
- status[i] = FileUtil.copyFile(in, realToPath.toOSString());
- } catch (Exception e) {
- // FIX-ME
- } finally {
- if (in != null)
- try {
- in.close();
- } catch (Exception e) { }
- }
- }
- monitor.worked(1);
- }
-
- monitor.done();
- return status;
- }
-
- /**
- * Delete the entire module from the remote location.
- *
- * @param monitor org.eclipse.core.runtime.IProgressMonitor
- * @return org.eclipse.core.runtime.IStatus
- */
- public IStatus deleteAll(IProgressMonitor monitor) {
- IPath path = getRemoteRoot().append(module.getContextRoot());
-
- FileUtil.deleteDirectory(path.toFile(), monitor);
- return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%projectCleanupSuccess", module.getContextRoot()), null);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Trace.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Trace.java
deleted file mode 100644
index 338cbf5..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Trace.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * Helper class to route trace output.
- */
-public class Trace {
- public static byte CONFIG = 0;
- public static byte WARNING = 1;
- public static byte SEVERE = 2;
- public static byte FINEST = 3;
- public static byte FINER = 4;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(byte level, String s) {
- Trace.trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param s java.lang.String
- * @param t java.lang.Throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (!TomcatPlugin.getInstance().isDebugging())
- return;
-
- System.out.println(s);
- if (t != null)
- t.printStackTrace();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(String s) {
- trace(s, null);
- }
-
- /**
- * Trace the given exception.
- *
- * @param s java.lang.String
- * @param e java.lang.Throwable
- */
- public static void trace(String s, Throwable t) {
- trace(FINEST, s, t);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/WebAppDocument.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/WebAppDocument.java
deleted file mode 100644
index 4b59012..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/WebAppDocument.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.IMimeMapping;
-import org.eclipse.jst.server.tomcat.core.internal.xml.XMLUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-import org.eclipse.wst.server.core.util.ProgressUtil;
-/**
- * Helper class to access a web.xml file.
- */
-public class WebAppDocument {
- protected boolean isWebAppDirty;
- protected Document webAppDocument;
-
- /**
- * Loads a web.xml from the given URL.
- *
- * @param url java.net.URL
- */
- public WebAppDocument(IPath path) throws Exception {
- webAppDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(new FileInputStream(path.toFile())));
- }
-
- /**
- * Loads a web.xml from the given resource.
- *
- * @param resource org.eclipse.core.resources.IResource
- */
- public WebAppDocument(IFile file) throws Exception {
- webAppDocument = XMLUtil.getDocumentBuilder().parse(new InputSource(file.getContents()));
- }
-
- /**
- * Adds a MimeMapping.
- *
- * @param index int
- * @param map org.eclipse.jst.server.tomcat.MimeMapping
- */
- public void addMimeMapping(int index, IMimeMapping map) {
- Trace.trace("Adding mime mapping " + index + " " + map.getMimeType() + " " + map.getExtension());
- Element element = webAppDocument.getDocumentElement();
- Element mapping = XMLUtil.createChildElement(webAppDocument, element, index, "mime-mapping");
- XMLUtil.insertText(webAppDocument, mapping, "\n\t");
- XMLUtil.createTextChildElement(webAppDocument, mapping, "extension", map.getExtension());
- XMLUtil.insertText(webAppDocument, mapping, "\n\t");
- XMLUtil.createTextChildElement(webAppDocument, mapping, "mime-type", map.getMimeType());
- XMLUtil.insertText(webAppDocument, mapping, "\n");
-
- isWebAppDirty = true;
- }
-
- /**
- * Returns a list of MimeMappings.
- *
- * @return java.util.List
- */
- public List getMimeMappings() {
- List map = new ArrayList();
-
- Element root = webAppDocument.getDocumentElement();
- Iterator iterator = XMLUtil.getNodeIterator(root, "mime-mapping");
- while (iterator.hasNext()) {
- Element element = (Element) iterator.next();
- String mimeType = XMLUtil.getSubNodeValue(element, "mime-type");
- String extension = XMLUtil.getSubNodeValue(element, "extension");
- MimeMapping mm = new MimeMapping(extension, mimeType);
- map.add(mm);
- }
-
- return map;
- }
-
- /**
- * Modifies a mime mapping.
- *
- * @param index int
- * @param mapping org.eclipse.jst.server.tomcat.MimeMapping
- */
- public void modifyMimeMapping(int index, IMimeMapping map) {
- Element element = webAppDocument.getDocumentElement();
- NodeList list = element.getElementsByTagName("mime-mapping");
- Element element2 = (Element) list.item(index);
- XMLUtil.setNodeValue(element2.getElementsByTagName("extension").item(0), "extension", map.getExtension());
- XMLUtil.setNodeValue(element2.getElementsByTagName("mime-type").item(0), "mime-type", map.getMimeType());
-
- isWebAppDirty = true;
- }
-
- /**
- * Removes the mime mapping at the specified index.
- *
- * @param index int
- */
- public void removeMimeMapping(int index) {
- Element element = webAppDocument.getDocumentElement();
- NodeList list = element.getElementsByTagName("mime-mapping");
- Node node = list.item(index);
- element.removeChild(node);
- isWebAppDirty = true;
- }
-
- /**
- * Saves the Web app document.
- *
- * @param filename java.lang.String
- */
- /*public void save(String dirPath, boolean forceDirty) throws IOException {
- if (forceDirty || isWebAppDirty)
- XMLUtil.save(dirPath + "web.xml", webAppDocument);
- }*/
-
- /**
- * Saves the Web app document.
- *
- * @param filename java.lang.String
- */
- public void save(String path, boolean forceDirty) throws IOException {
- if (forceDirty || isWebAppDirty)
- XMLUtil.save(path, webAppDocument);
- }
-
- /**
- * Saves the Web app document.
- *
- * @param filename java.lang.String
- */
- public void save(IFile file, IProgressMonitor monitor) throws Exception {
- byte[] data = XMLUtil.getContents(webAppDocument);
- InputStream in = null;
- try {
- in = new ByteArrayInputStream(data);
- if (file.exists())
- file.setContents(in, true, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- else
- file.create(in, true, ProgressUtil.getSubMonitorFor(monitor, 200));
- } catch (Exception e) {
- } finally {
- try {
- in.close();
- } catch (Exception e) { }
- }
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/AddMimeMappingCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/AddMimeMappingCommand.java
deleted file mode 100644
index 857b4ab..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/AddMimeMappingCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.*;
-import org.eclipse.jst.server.tomcat.core.internal.*;
-/**
- * Command to add a mime mapping.
- */
-public class AddMimeMappingCommand extends ConfigurationCommand {
- protected MimeMapping map;
-
- /**
- * ModifyMimeTypeExtensionCommand constructor comment.
- */
- public AddMimeMappingCommand(ITomcatConfigurationWorkingCopy configuration, MimeMapping map) {
- super(configuration);
- this.map = map;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- configuration.addMimeMapping(0, map);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%configurationEditorActionAddMimeMappingDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionAddMimeMapping");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.removeMimeMapping(0);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/AddWebModuleCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/AddWebModuleCommand.java
deleted file mode 100644
index 8ba4c8f..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/AddWebModuleCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.*;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to add a web module.
- */
-public class AddWebModuleCommand extends ConfigurationCommand {
- protected WebModule module;
- protected int modules = -1;
-
- /**
- * AddWebModuleCommand constructor comment.
- */
- public AddWebModuleCommand(ITomcatConfigurationWorkingCopy configuration, WebModule module) {
- super(configuration);
- this.module = module;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- modules = configuration.getWebModules().size();
- configuration.addWebModule(-1, module);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%configurationEditorActionAddWebModuleDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionAddWebModule");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.removeWebModule(modules);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ConfigurationCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ConfigurationCommand.java
deleted file mode 100644
index 517c134..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ConfigurationCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.util.Task;
-/**
- * Configuration command.
- */
-public abstract class ConfigurationCommand extends Task {
- protected ITomcatConfigurationWorkingCopy configuration;
-
- /**
- * ConfigurationCommand constructor comment.
- */
- public ConfigurationCommand(ITomcatConfigurationWorkingCopy configuration) {
- super();
- this.configuration = configuration;
- }
-
- /**
- * Returns true if this command can be undone.
- * @return boolean
- */
- public boolean canUndo() {
- return true;
- }
-
- public abstract boolean execute();
-
- public void execute(IProgressMonitor monitor) {
- execute();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyMimeMappingCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyMimeMappingCommand.java
deleted file mode 100644
index 549494d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyMimeMappingCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.MimeMapping;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to change a mime type extension.
- */
-public class ModifyMimeMappingCommand extends ConfigurationCommand {
- protected int index;
- protected MimeMapping oldMap;
- protected MimeMapping newMap;
-
- public ModifyMimeMappingCommand(ITomcatConfigurationWorkingCopy configuration, int index, MimeMapping map) {
- super(configuration);
- this.index = index;
- newMap = map;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- oldMap = (MimeMapping) configuration.getMimeMappings().get(index);
- configuration.modifyMimeMapping(index, newMap);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%configurationEditorActionModifyMimeMappingDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionModifyMimeMapping");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.modifyMimeMapping(index, oldMap);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyPortCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyPortCommand.java
deleted file mode 100644
index 4915720..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyPortCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.Iterator;
-
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-import org.eclipse.wst.server.core.model.IServerPort;
-/**
- * Command to change the configuration port.
- */
-public class ModifyPortCommand extends ConfigurationCommand {
- protected String id;
- protected int port;
- protected int oldPort;
-
- /**
- * ChangePortCommand constructor comment.
- */
- public ModifyPortCommand(ITomcatConfigurationWorkingCopy configuration, String id, int port) {
- super(configuration);
- this.id = id;
- this.port = port;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- // find old port number
- Iterator iterator = configuration.getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort temp = (IServerPort) iterator.next();
- if (id.equals(temp.getId()))
- oldPort = temp.getPort();
- }
-
- // make the change
- configuration.modifyServerPort(id, port);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%configurationEditorActionModifyPortDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionModifyPort");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.modifyServerPort(id, oldPort);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyWebModuleCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyWebModuleCommand.java
deleted file mode 100644
index 4f470f7..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ModifyWebModuleCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to change a web module.
- */
-public class ModifyWebModuleCommand extends ConfigurationCommand {
- protected int index;
- protected WebModule oldModule;
- protected WebModule newModule;
-
- public ModifyWebModuleCommand(ITomcatConfigurationWorkingCopy configuration, int index, WebModule module) {
- super(configuration);
- this.index = index;
- newModule = module;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- oldModule = (WebModule) configuration.getWebModules().get(index);
- configuration.modifyWebModule(index, newModule.getDocumentBase(), newModule.getPath(), newModule.isReloadable());
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%configurationEditorActionModifyWebModuleDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionModifyWebModule");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.modifyWebModule(index, oldModule.getDocumentBase(), oldModule.getPath(), oldModule.isReloadable());
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveMimeMappingCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveMimeMappingCommand.java
deleted file mode 100644
index 49ac07b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveMimeMappingCommand.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.MimeMapping;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to remove a mime mapping.
- */
-public class RemoveMimeMappingCommand extends ConfigurationCommand {
- protected int index;
- protected MimeMapping mapping;
-
- /**
- * ModifyMimeTypeExtensionCommand constructor comment.
- */
- public RemoveMimeMappingCommand(ITomcatConfigurationWorkingCopy configuration, int index) {
- super(configuration);
- this.index = index;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- mapping = (MimeMapping) configuration.getMimeMappings().get(index);
- configuration.removeMimeMapping(index);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%configurationEditorActionRemoveMimeMappingDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionRemoveMimeMapping");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.addMimeMapping(index, mapping);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveWebModuleCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveWebModuleCommand.java
deleted file mode 100644
index fca5d86..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveWebModuleCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to remove a web module.
- */
-public class RemoveWebModuleCommand extends ConfigurationCommand {
- protected int index;
- protected WebModule module;
-
- /**
- * RemoveWebModuleCommand constructor comment.
- */
- public RemoveWebModuleCommand(ITomcatConfigurationWorkingCopy configuration, int index) {
- super(configuration);
- this.index = index;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- module = (WebModule) configuration.getWebModules().get(index);
- configuration.removeWebModule(index);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- if (module == null)
- module = (WebModule) configuration.getWebModules().get(index);
- return TomcatPlugin.getResource("%configurationEditorActionRemoveWebModuleDescription", module.getPath());
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionRemoveWebModule");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.addWebModule(index, module);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveWebModuleTask.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveWebModuleTask.java
deleted file mode 100644
index 4f70202..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/RemoveWebModuleTask.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.ITaskModel;
-import org.eclipse.wst.server.core.util.Task;
-/**
- * Task to remove a web module.
- */
-public class RemoveWebModuleTask extends Task {
- protected int index;
- protected WebModule module;
-
- /**
- * RemoveWebModuleTask constructor comment.
- */
- public RemoveWebModuleTask(int index) {
- super();
- this.index = index;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public void execute(IProgressMonitor monitor) throws CoreException {
- IServerConfigurationWorkingCopy wc = (IServerConfigurationWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_SERVER_CONFIGURATION);
- ITomcatConfigurationWorkingCopy configuration = (ITomcatConfigurationWorkingCopy) wc.getWorkingCopyDelegate();
- module = (WebModule) configuration.getWebModules().get(index);
- configuration.removeWebModule(index);
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- if (module == null) {
- IServerConfiguration config = (IServerConfiguration) getTaskModel().getObject(ITaskModel.TASK_SERVER_CONFIGURATION);
- ITomcatConfiguration configuration = (ITomcatConfiguration) config.getDelegate();
- module = (WebModule) configuration.getWebModules().get(index);
- }
- return TomcatPlugin.getResource("%configurationEditorActionRemoveWebModuleDescription", module.getPath());
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionRemoveWebModule");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- try {
- IServerConfigurationWorkingCopy wc = (IServerConfigurationWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_SERVER_CONFIGURATION);
- ITomcatConfigurationWorkingCopy configuration = (ITomcatConfigurationWorkingCopy) wc.getWorkingCopyDelegate();
- configuration.addWebModule(index, module);
- } catch (Exception e) { }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ServerCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ServerCommand.java
deleted file mode 100644
index 38eed7b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/ServerCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.ITomcatServerWorkingCopy;
-import org.eclipse.wst.server.core.util.Task;
-/**
- * A command on a Tomcat server.
- */
-public abstract class ServerCommand extends Task {
- protected ITomcatServerWorkingCopy server;
-
- /**
- * ServerCommand constructor comment.
- */
- public ServerCommand(ITomcatServerWorkingCopy server) {
- super();
- this.server = server;
- }
-
- /**
- * Returns true if this command can be undone.
- * @return boolean
- */
- public boolean canUndo() {
- return true;
- }
-
- public abstract boolean execute();
-
- public void execute(IProgressMonitor monitor) {
- execute();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetDebugModeCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetDebugModeCommand.java
deleted file mode 100644
index 944bb0e..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetDebugModeCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatServerWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to change the server debug mode.
- */
-public class SetDebugModeCommand extends ServerCommand {
- protected boolean debug;
- protected boolean oldDebug;
-
- /**
- * SetDebugModeCommand constructor comment.
- */
- public SetDebugModeCommand(ITomcatServerWorkingCopy server, boolean debug) {
- super(server);
- this.debug = debug;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- oldDebug = server.isDebug();
- server.setDebug(debug);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%serverEditorActionSetDebugModeDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%serverEditorActionSetDebugMode");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- server.setDebug(oldDebug);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetSecureCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetSecureCommand.java
deleted file mode 100644
index 2e381bf..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetSecureCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatServerWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to change the server security option.
- */
-public class SetSecureCommand extends ServerCommand {
- protected boolean secure;
- protected boolean oldSecure;
-
- /**
- * SetSecureCommand constructor comment.
- */
- public SetSecureCommand(ITomcatServerWorkingCopy server, boolean secure) {
- super(server);
- this.secure = secure;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- oldSecure = server.isSecure();
- server.setSecure(secure);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%serverEditorActionSetSecureDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%serverEditorActionSetSecure");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- server.setSecure(oldSecure);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetTestEnvironmentCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetTestEnvironmentCommand.java
deleted file mode 100644
index 365effb..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetTestEnvironmentCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatServerWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to change the server debug mode.
- */
-public class SetTestEnvironmentCommand extends ServerCommand {
- protected boolean te;
- protected boolean oldTe;
-
- /**
- * SetTestEnvironmentCommand constructor comment.
- */
- public SetTestEnvironmentCommand(ITomcatServerWorkingCopy server, boolean te) {
- super(server);
- this.te = te;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- oldTe = server.isTestEnvironment();
- server.setTestEnvironment(te);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- return TomcatPlugin.getResource("%serverEditorActionSetTestEnvironmentDescription");
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%serverEditorActionSetTestEnvironment");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- server.setTestEnvironment(oldTe);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetWebModulePathCommand.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetWebModulePathCommand.java
deleted file mode 100644
index ab778f7..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetWebModulePathCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-/**
- * Command to modify the path of a Web module.
- */
-public class SetWebModulePathCommand extends ConfigurationCommand {
- protected int index;
- protected WebModule oldModule;
- protected String path;
-
- /**
- * SetWebModulePathCommand constructor comment.
- */
- public SetWebModulePathCommand(ITomcatConfigurationWorkingCopy configuration, int index, String contextRoot) {
- super(configuration);
- this.index = index;
- this.path = contextRoot;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public boolean execute() {
- oldModule = (WebModule) configuration.getWebModules().get(index);
- configuration.removeWebModule(index);
-
- WebModule module = new WebModule(path, oldModule.getDocumentBase(), oldModule.getMemento(), oldModule.isReloadable());
- configuration.addWebModule(index, module);
- return true;
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- if (oldModule == null)
- oldModule = (WebModule) configuration.getWebModules().get(index);
-
- return TomcatPlugin.getResource("%configurationEditorActionEditWebModuleDescription", oldModule.getPath(), path);
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionEditWebModulePath");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- configuration.removeWebModule(index);
- configuration.addWebModule(index, oldModule);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetWebModulePathTask.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetWebModulePathTask.java
deleted file mode 100644
index 332112d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/command/SetWebModulePathTask.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.command;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.core.IServerConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.ITaskModel;
-import org.eclipse.wst.server.core.util.Task;
-/**
- * Task to modify the path of a Web module.
- */
-public class SetWebModulePathTask extends Task {
- protected int index;
- protected WebModule oldModule;
- protected String path;
-
- /**
- * SetWebModulePathTask constructor comment.
- */
- public SetWebModulePathTask(int index, String contextRoot) {
- super();
- this.index = index;
- this.path = contextRoot;
- }
-
- /**
- * Execute the command.
- * @return boolean
- */
- public void execute(IProgressMonitor monitor) throws CoreException {
- IServerConfigurationWorkingCopy wc = (IServerConfigurationWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_SERVER_CONFIGURATION);
- ITomcatConfigurationWorkingCopy configuration = (ITomcatConfigurationWorkingCopy) wc.getWorkingCopyDelegate();
- oldModule = (WebModule) configuration.getWebModules().get(index);
- configuration.removeWebModule(index);
-
- WebModule module = new WebModule(path, oldModule.getDocumentBase(), oldModule.getMemento(), oldModule.isReloadable());
- configuration.addWebModule(index, module);
- }
-
- /**
- * Returns this command's description.
- * @return java.lang.String
- */
- public String getDescription() {
- if (oldModule == null) {
- IServerConfiguration config = (IServerConfiguration) getTaskModel().getObject(ITaskModel.TASK_SERVER_CONFIGURATION);
- ITomcatConfiguration configuration = (ITomcatConfiguration) config.getDelegate();
- oldModule = (WebModule) configuration.getWebModules().get(index);
- }
-
- return TomcatPlugin.getResource("%configurationEditorActionEditWebModuleDescription", oldModule.getPath(), path);
- }
-
- /**
- * Returns this command's label.
- * @return java.lang.String
- */
- public String getName() {
- return TomcatPlugin.getResource("%configurationEditorActionEditWebModulePath");
- }
-
- /**
- * Undo the command.
- */
- public void undo() {
- try {
- IServerConfigurationWorkingCopy wc = (IServerConfigurationWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_SERVER_CONFIGURATION);
- ITomcatConfigurationWorkingCopy configuration = (ITomcatConfigurationWorkingCopy) wc.getWorkingCopyDelegate();
- configuration.removeWebModule(index);
- configuration.addWebModule(index, oldModule);
- } catch (Exception e) { }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/Factory.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/Factory.java
deleted file mode 100644
index 9c82af9..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/Factory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.InputSource;
-
-import org.eclipse.jst.server.tomcat.core.internal.Trace;
-/**
- * Factory for reading and writing from XML files.
- */
-public class Factory implements Serializable {
-
-
- private static final long serialVersionUID = 1L;
-
- protected String packageName;
- protected Document document;
-
- public Factory() { }
-
- protected Attr createAttribute(String s, Element element) {
- Attr attr = document.createAttribute(s);
- element.setAttributeNode(attr);
- return attr;
- }
-
- protected XMLElement createElement(int index, String s, Node node) {
- if (index < 0)
- return createElement(s, node);
-
- Element element = document.createElement(s);
- try {
- Node child = node.getFirstChild();
- for (int i = 0; i < index; i++)
- child = child.getNextSibling();
-
- node.insertBefore(element, child);
- } catch (Exception e) {
- node.appendChild(element);
- }
- return newInstance(element);
- }
-
- protected XMLElement createElement(String s, Node node) {
- Element element = document.createElement(s);
- node.appendChild(element);
- return newInstance(element);
- }
-
- public byte[] getContents() throws IOException {
- return XMLUtil.getContents(document);
- }
-
- /**
- *
- * @return org.w3c.dom.Document
- */
- public Document getDocument() {
- return document;
- }
-
- public String getPackageName() {
- return packageName;
- }
-
- public XMLElement loadDocument(InputStream in) throws IOException {
- try {
- InputStreamReader reader = new InputStreamReader(in);
- document = XMLUtil.getDocumentBuilder().parse(new InputSource(reader));
- Element element = document.getDocumentElement();
- return newInstance(element);
- } catch (Exception exception) {
- Trace.trace(Trace.WARNING, "Error loading document", exception);
- throw new IOException("Could not load document");
- }
- }
-
- protected XMLElement newInstance(Element element) {
- String s = element.getNodeName();
- try {
- // change "web-app:test" to "WebAppTest"
- s = s.substring(0, 1).toUpperCase() + s.substring(1);
- int i = s.indexOf("-");
- while (i >= 0) {
- s = s.substring(0, i) + s.substring(i+1, i+2).toUpperCase() + s.substring(i+2);
- i = s.indexOf("-");
- }
- i = s.indexOf(":");
- while (i >= 0) {
- s = s.substring(0, i) + s.substring(i+1, i+2).toUpperCase() + s.substring(i+2);
- i = s.indexOf(":");
- }
-
- // add package name
- if (packageName != null)
- s = packageName + "." + s;
- Class class1 = Class.forName(s);
-
- XMLElement ibmxmlelement = (XMLElement) class1.newInstance();
- ibmxmlelement.setElement(element);
- ibmxmlelement.setFactory(this);
- return ibmxmlelement;
- } catch (Exception exception) { }
- return null;
- }
-
- public void save(String filename) throws IOException {
- XMLUtil.save(filename, document);
- }
-
- public void setDocument(Document d) {
- document = d;
- }
-
- public void setPackageName(String s) {
- packageName = s;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
deleted file mode 100644
index 2e9ee79..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.Serializable;
-import org.w3c.dom.*;
-/**
- * An XML element.
- */
-public class XMLElement implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Element xmlElement;
- protected Factory factory;
-
- public XMLElement() { }
-
- public Attr addAttribute(String s, String s1) {
- Attr attr = factory.createAttribute(s, xmlElement);
- attr.setValue(s1);
- return attr;
- }
-
- public XMLElement createElement(int index, String s) {
- return factory.createElement(index, s, xmlElement);
- }
-
- public XMLElement createElement(String s) {
- return factory.createElement(s, xmlElement);
- }
-
- public void createEmptyBody() {
- }
-
- public XMLElement findElement(String s) {
- NodeList nodelist = xmlElement.getElementsByTagName(s);
- int i = nodelist == null ? 0 : nodelist.getLength();
- for (int j = 0; j < i; j++) {
- Node node = nodelist.item(j);
- String s1 = node.getNodeName().trim();
- if (s1.equals(s))
- return factory.newInstance((Element) node);
- }
-
- return createElement(s);
- }
-
- public XMLElement findElement(String s, int i) {
- NodeList nodelist = xmlElement.getElementsByTagName(s);
- int j = nodelist == null ? 0 : nodelist.getLength();
- for (int k = 0; k < j; k++) {
- Node node = nodelist.item(k);
- String s1 = node.getNodeName().trim();
- if (s1.equals(s) && k == i)
- return factory.newInstance((Element) node);
- }
-
- return createElement(s);
- }
-
- public String getAttributeValue(String s) {
- Attr attr = xmlElement.getAttributeNode(s);
- if (attr != null)
- return attr.getValue();
-
- return null;
- }
-
- public String getElementName() {
- return xmlElement.getNodeName();
- }
-
- public String getElementValue() {
- return getElementValue(xmlElement);
- }
-
- protected static String getElementValue(Element element) {
- String s = element.getNodeValue();
- if (s != null)
- return s;
- NodeList nodelist = element.getChildNodes();
- for (int i = 0; i < nodelist.getLength(); i++)
- if (nodelist.item(i) instanceof Text)
- return ((Text) nodelist.item(i)).getData();
-
- return null;
- }
-
- public Element getSubElement(String s) {
- NodeList nodelist = xmlElement.getElementsByTagName(s);
- int i = nodelist == null ? 0 : nodelist.getLength();
- for (int j = 0; j < i; j++) {
- Node node = nodelist.item(j);
- String s1 = node.getNodeName().trim();
- if (s1.equals(s))
- return (Element) node;
- }
-
- return null;
- }
-
- public String getSubElementValue(String s) {
- Element element = getSubElement(s);
- if (element == null)
- return null;
-
- String value = getElementValue(element);
- if (value == null)
- return null;
-
- return value.trim();
- }
-
- public boolean removeAttribute(String s) {
- try {
- xmlElement.removeAttribute(s);
- return true;
- } catch (Exception ex) {
- return false;
- }
- }
-
- public boolean removeElement(String s, int i) {
- NodeList nodelist = xmlElement.getElementsByTagName(s);
- int j = nodelist == null ? 0 : nodelist.getLength();
- for (int k = 0; k < j; k++) {
- Node node = nodelist.item(k);
- String s1 = node.getNodeName().trim();
- if (s1.equals(s) && k == i) {
- xmlElement.removeChild(node);
- return true;
- }
- }
-
- return false;
- }
-
- public void setAttributeValue(String s, String s1) {
- Attr attr = xmlElement.getAttributeNode(s);
- if (attr == null)
- attr = addAttribute(s, s1);
- else
- attr.setValue(s1);
- }
-
- void setElement(Element element) {
- xmlElement = element;
- }
-
- protected static void setElementValue(Element element, String value) {
- String s = element.getNodeValue();
- if (s != null) {
- element.setNodeValue(value);
- return;
- }
- NodeList nodelist = element.getChildNodes();
- for (int i = 0; i < nodelist.getLength(); i++)
- if (nodelist.item(i) instanceof Text) {
- Text text = (Text) nodelist.item(i);
- text.setData(value);
- return;
- }
-
- return;
- }
-
- void setFactory(Factory factory1) {
- factory = factory1;
- }
-
- public void setSubElementValue(String s, String value) {
- Element element = getSubElement(s);
- if (element == null) {
- element = factory.document.createElement(s);
- element.appendChild(factory.document.createTextNode("temp"));
- xmlElement.appendChild(element);
- }
- setElementValue(element, value);
- }
-
- public int sizeOfElement(String s) {
- NodeList nodelist = xmlElement.getElementsByTagName(s);
- int i = nodelist == null ? 0 : nodelist.getLength();
- return i;
- }
-
- public void updateElementValue(String s) {
- try {
- xmlElement.setNodeValue(s);
- } catch (DOMException ex) {
- NodeList nodelist = xmlElement.getChildNodes();
- int i = nodelist == null ? 0 : nodelist.getLength();
- if (i > 0) {
- for (int j = 0; j < i; j++)
- if (nodelist.item(j) instanceof Text) {
- ((Text) nodelist.item(j)).setData(s);
- return;
- }
- } else {
- xmlElement.appendChild(factory.document.createTextNode(s));
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLUtil.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLUtil.java
deleted file mode 100644
index 421b297..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLUtil.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.io.*;
-import java.util.*;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.jst.server.tomcat.core.internal.Trace;
-import org.w3c.dom.*;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-/**
- * Utility class to create and read XML documents.
- */
-public class XMLUtil {
- private static DocumentBuilder documentBuilder;
-
- /**
- * XMLUtil constructor comment.
- */
- public XMLUtil() {
- super();
- }
-
- public static DocumentBuilder getDocumentBuilder() {
- if (documentBuilder == null)
- try {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setValidating(false);
- factory.setNamespaceAware(false);
- factory.setExpandEntityReferences(false);
- //factory.setAttribute("http://apache.org/xml/features/nonvalidating/load-external-dtd", new Boolean(false));
- documentBuilder = factory.newDocumentBuilder();
- documentBuilder.setEntityResolver(new EntityResolver() {
- public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
- return new InputSource(new ByteArrayInputStream(new byte[0]));
- }
- });
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Rrror creating document builder");
- }
-
- return documentBuilder;
- }
-
- /**
- * Create a child of the given node at the given index.
- * @return org.w3c.dom.Element
- * @param nodeName java.lang.String
- */
- public static Element createChildElement(Document doc, Element element, int index, String nodeName) {
- Element element2 = doc.createElement(nodeName);
- try {
- NodeList childList = element.getElementsByTagName(nodeName);
- Node child = childList.item(index);
- element.insertBefore(element2, child);
- } catch (Exception e) {
- element.appendChild(element2);
- }
- return element2;
- }
-
- /**
- * Create a child of the given node.
- * @return org.w3c.dom.Element
- * @param nodeName java.lang.String
- */
- public static Element createChildElement(Document doc, Node node, String nodeName) {
- Element element = doc.createElement(nodeName);
- node.appendChild(element);
- return element;
- }
-
- /**
- * Set the value of the given node to the given text.
- * @param n org.w3c.dom.Node
- */
- public static void createTextChildElement(Document doc, Node node, String name, String value) {
- Element element = createChildElement(doc, node, name);
- element.appendChild(doc.createTextNode(value));
- }
-
- /**
- * Return the attribute value.
- * @return java.lang.String
- * @param element org.w3c.dom.Element
- * @param attr java.lang.String
- */
- public static String getAttributeValue(Element element, String attr) {
- return element.getAttributeNode(attr).getValue();
- }
-
- public static byte[] getContents(Document document) throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- try {
- print(new PrintWriter(out), document);
- return out.toByteArray();
- } catch (Exception ex) {
- throw new IOException(ex.getLocalizedMessage());
- } finally {
- if (out != null)
- try {
- out.close();
- } catch (Exception e) { }
- }
- }
-
- protected static String getDocumentTypeData(DocumentType doctype) {
- String data = doctype.getName();
- if (doctype.getPublicId() != null) {
- data += " PUBLIC \"" + doctype.getPublicId() + "\"";
- String systemId = doctype.getSystemId();
- if (systemId == null)
- systemId = "";
- data += " \"" + systemId + "\"";
- } else
- data += " SYSTEM \"" + doctype.getSystemId() + "\"";
-
- return data;
- }
-
- /**
- * Return an iterator for the subelements.
- * @return java.util.Iterator
- * @param element org.w3c.dom.Element
- * @param name java.lang.String
- */
- public static Iterator getNodeIterator(Element element, String name) {
- List list = new ArrayList();
- NodeList nodeList = element.getElementsByTagName(name);
-
- int length = nodeList.getLength();
- for (int i = 0; i < length; i++)
- list.add(nodeList.item(i));
-
- return list.iterator();
- }
-
- /**
- * Get the value of this node. Will return "" instead of null.
- * @return java.lang.String
- * @param node org.w3c.dom.Node
- */
- public static String getNodeValue(Node node) {
- NodeList nodeList = node.getChildNodes();
-
- int length = nodeList.getLength();
- for (int i = 0; i < length; i++) {
- Node n = nodeList.item(i);
- if (n instanceof Text) {
- Text t = (Text) n;
- return t.getNodeValue();
- }
- }
- return "";
- }
-
- /**
- * Get the value of a subnode.
- * @return java.lang.String
- * @param node org.w3c.dom.Node
- */
- public static String getSubNodeValue(Element element, String name) {
- NodeList nodeList = element.getElementsByTagName(name);
- return getNodeValue(nodeList.item(0)).trim();
- }
-
- /**
- * Insert the given text.
- * @param n org.w3c.dom.Node
- */
- public static void insertText(Document doc, Node node, String text) {
- node.appendChild(doc.createCDATASection(text));
- }
-
- protected static String normalize(String s) {
- StringBuffer stringbuffer = new StringBuffer();
- int i = s == null ? 0 : s.length();
- for (int j = 0; j < i; j++) {
- char c = s.charAt(j);
- switch (c) {
- case 60 : /* '<' */
- stringbuffer.append("<");
- break;
-
- case 62 : /* '>' */
- stringbuffer.append(">");
- break;
-
- case 38 : /* '&' */
- stringbuffer.append("&");
- break;
-
- case 34 : /* '"' */
- stringbuffer.append(""");
- break;
-
- case 10 : /* '\n' */
- case 13 : /* '\r' */
- default :
- stringbuffer.append(c);
- break;
-
- }
- }
-
- return stringbuffer.toString();
- }
-
- protected static void print(PrintWriter out, Node node) {
- if (node == null)
- return;
- short type = node.getNodeType();
- switch (type) {
- case Node.DOCUMENT_NODE: {
- //out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
- out.println("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n");
- NodeList nodelist = node.getChildNodes();
- int size = nodelist.getLength();
- for (int i = 0; i < size; i++)
- print(out, nodelist.item(i));
- break;
- }
-
- case Node.DOCUMENT_TYPE_NODE: {
- DocumentType docType = (DocumentType) node;
- out.print("<!DOCTYPE " + getDocumentTypeData(docType) + ">\n");
- break;
- }
-
- case Node.ELEMENT_NODE: {
- out.print('<');
- out.print(node.getNodeName());
- NamedNodeMap map = node.getAttributes();
- if (map != null) {
- int size = map.getLength();
- for (int i = 0; i < size; i++) {
- Attr attr = (Attr) map.item(i);
- out.print(' ');
- out.print(attr.getNodeName());
- out.print("=\"");
- out.print(normalize(attr.getNodeValue()));
- out.print('"');
- }
- }
-
- if (!node.hasChildNodes())
- out.print("/>");
- else {
- out.print('>');
- NodeList nodelist = node.getChildNodes();
- int numChildren = nodelist.getLength();
- for (int i = 0; i < numChildren; i++)
- print(out, nodelist.item(i));
-
- out.print("</");
- out.print(node.getNodeName());
- out.print('>');
- }
- break;
- }
-
- case Node.ENTITY_REFERENCE_NODE: {
- NodeList nodelist = node.getChildNodes();
- if (nodelist != null) {
- int size = nodelist.getLength();
- for (int i = 0; i < size; i++)
- print(out, nodelist.item(i));
-
- }
- break;
- }
-
- case Node.CDATA_SECTION_NODE: {
- out.print(normalize(node.getNodeValue()));
- break;
- }
-
- case Node.TEXT_NODE: {
- out.print(normalize(node.getNodeValue()));
- break;
- }
-
- case Node.PROCESSING_INSTRUCTION_NODE: {
- out.print("<?");
- out.print(node.getNodeName());
- String s = node.getNodeValue();
- if (s != null && s.length() > 0) {
- out.print(' ');
- out.print(s);
- }
- out.print("?>");
- break;
- }
-
- case Node.COMMENT_NODE: {
- out.print("<!--");
- out.print(node.getNodeValue());
- out.print("-->");
- break;
- }
-
- default: {
- out.print(normalize(node.getNodeValue()));
- break;
- }
- }
- out.flush();
- }
-
- public static void save(String filename, Document document) throws IOException {
- PrintWriter out = null;
- try {
- out = new PrintWriter(new BufferedWriter(new FileWriter(filename)));
- //traceNode(document, "");
- print(out, document);
- } catch (Exception ex) {
- throw new IOException(ex.getLocalizedMessage());
- } finally {
- if (out != null)
- try {
- out.close();
- } catch (Exception e) { }
- }
- }
-
- /**
- * Set the value of the subnode
- *
- * @param element org.w3c.dom.Element
- * @param name java.lang.String
- * @param value java.lang.String
- */
- public static void setNodeValue(Node node, String name, String value) {
- String s = node.getNodeValue();
- if (s != null) {
- node.setNodeValue(value);
- return;
- }
- NodeList nodelist = node.getChildNodes();
- for (int i = 0; i < nodelist.getLength(); i++) {
- if (nodelist.item(i) instanceof Text) {
- Text text = (Text) nodelist.item(i);
- text.setData(value);
- return;
- }
- }
- return;
- }
-
- public static String toString(Document document) {
- PrintWriter out = null;
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- out = new PrintWriter(baos);
- print(out, document);
- return new String(baos.toByteArray());
- } catch (Exception ex) {
- } finally {
- if (out != null)
- try {
- out.close();
- } catch (Exception e) { }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Connector.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Connector.java
deleted file mode 100644
index e014b9d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Connector.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server32;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Connector extends XMLElement {
- public Connector() { }
-
- public String getClassName() {
- return getAttributeValue("className");
- }
-
- public Parameter getParameter(int index) {
- return (Parameter) findElement("Parameter", index);
- }
-
- public int getParameterCount() {
- return sizeOfElement("Parameter");
- }
-
- public void setClassName(String className) {
- setAttributeValue("className", className);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Context.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Context.java
deleted file mode 100644
index 7157981..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Context.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server32;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Context extends XMLElement {
- public Context() { }
-
- public String getCrossContext() {
- return getAttributeValue("crossContext");
- }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public String getDocBase() {
- return getAttributeValue("docBase");
- }
-
- public String getPath() {
- return getAttributeValue("path");
- }
-
- public String getReloadable() {
- return getAttributeValue("reloadable");
- }
-
- public String getSource() {
- return getAttributeValue("source");
- }
-
- public String getTrusted() {
- return getAttributeValue("trusted");
- }
-
- public void setCrossContext(String crossContext) {
- setAttributeValue("crossContext", crossContext);
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-
- public void setDocBase(String docBase) {
- setAttributeValue("docBase", docBase);
- }
-
- public void setPath(String path) {
- setAttributeValue("path", path);
- }
-
- public void setReloadable(String reloadable) {
- setAttributeValue("reloadable", reloadable);
- }
-
- public void setSource(String source) {
- setAttributeValue("source", source);
- }
-
- public void setTrusted(String trusted) {
- setAttributeValue("trusted", trusted);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/ContextManager.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/ContextManager.java
deleted file mode 100644
index 0913c3a..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/ContextManager.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server32;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class ContextManager extends XMLElement {
- public ContextManager() { }
-
- public Connector getConnector(int index) {
- return (Connector) findElement("Connector", index);
- }
-
- public int getConnectorCount() {
- return sizeOfElement("Connector");
- }
-
- public Context getContext(int index) {
- return (Context) findElement("Context", index);
- }
-
- public int getContextCount() {
- return sizeOfElement("Context");
- }
-
- public int getContextInterceptorCount() {
- return sizeOfElement("ContextInterceptor");
- }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public String getHome() {
- return getAttributeValue("home");
- }
-
- public int getRequestInterceptorCount() {
- return sizeOfElement("RequestInterceptor");
- }
-
- public String getShowDebugInfo() {
- return getAttributeValue("showDebugInfo");
- }
-
- public String getWorkDir() {
- return getAttributeValue("workDir");
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-
- public void setHome(String home) {
- setAttributeValue("home", home);
- }
-
- public void setShowDebugInfo(String showDebugInfo) {
- setAttributeValue("showDebugInfo", showDebugInfo);
- }
-
- public void setWorkDir(String workDir) {
- setAttributeValue("workDir", workDir);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Parameter.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Parameter.java
deleted file mode 100644
index ca73ec8..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Parameter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server32;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Parameter extends XMLElement {
- public Parameter() { }
-
- public String getName() {
- return getAttributeValue("name");
- }
-
- public String getValue() {
- return getAttributeValue("value");
- }
-
- public void setName(String name) {
- setAttributeValue("name", name);
- }
-
- public void setValue(String value) {
- setAttributeValue("value", value);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Server.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Server.java
deleted file mode 100644
index 2011fa4..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server32/Server.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server32;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Server extends XMLElement {
- public Server() { }
-
- public ContextManager getContextManager() {
- return (ContextManager) findElement("ContextManager");
- }
-
- public int getLoggerCount() {
- return sizeOfElement("Logger");
- }
-
- public String getName() {
- return getAttributeValue("name");
- }
-
- public void setName(String name) {
- setAttributeValue("name", name);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Connector.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Connector.java
deleted file mode 100644
index f89e0f5..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Connector.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server40;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Connector extends XMLElement {
- public Connector() { }
-
- public String getAcceptCount() {
- return getAttributeValue("acceptCount");
- }
-
- public String getClassName() {
- return getAttributeValue("className");
- }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public String getMaxProcessors() {
- return getAttributeValue("maxProcessors");
- }
-
- public String getMinProcessors() {
- return getAttributeValue("minProcessors");
- }
-
- public String getPort() {
- return getAttributeValue("port");
- }
-
- public String getSecure() {
- return getAttributeValue("secure");
- }
-
- public String getProtocol() {
- return getAttributeValue("protocol");
- }
-
- public void setAcceptCount(String acceptCount) {
- setAttributeValue("acceptCount", acceptCount);
- }
-
- public void setClassName(String className) {
- setAttributeValue("className", className);
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-
- public void setMaxProcessors(String maxProcessors) {
- setAttributeValue("maxProcessors", maxProcessors);
- }
-
- public void setMinProcessors(String minProcessors) {
- setAttributeValue("minProcessors", minProcessors);
- }
-
- public void setPort(String port) {
- setAttributeValue("port", port);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Context.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Context.java
deleted file mode 100644
index ffbb584..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Context.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server40;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Context extends XMLElement {
- public Context() { }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public String getDocBase() {
- return getAttributeValue("docBase");
- }
-
- public String getPath() {
- return getAttributeValue("path");
- }
-
- public String getReloadable() {
- return getAttributeValue("reloadable");
- }
-
- public String getSource() {
- return getAttributeValue("source");
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-
- public void setDocBase(String docBase) {
- setAttributeValue("docBase", docBase);
- }
-
- public void setPath(String path) {
- setAttributeValue("path", path);
- }
-
- public void setReloadable(String reloadable) {
- setAttributeValue("reloadable", reloadable);
- }
-
- public void setSource(String source) {
- setAttributeValue("source", source);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Engine.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Engine.java
deleted file mode 100644
index ed7acd6..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Engine.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server40;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Engine extends XMLElement {
- public Engine() { }
-
- public String getAppBase() {
- return getAttributeValue("appBase");
- }
-
- public String getClassName() {
- return getAttributeValue("className");
- }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public String getDefaultHost() {
- return getAttributeValue("defaultHost");
- }
-
- public Host getHost() {
- return (Host) findElement("Host");
- }
-
- public String getName() {
- return getAttributeValue("name");
- }
-
- public void setAppBase(String appBase) {
- setAttributeValue("appBase", appBase);
- }
-
- public void setClassName(String className) {
- setAttributeValue("className", className);
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-
- public void setDefaultHost(String defaultHost) {
- setAttributeValue("defaultHost", defaultHost);
- }
-
- public void setName(String name) {
- setAttributeValue("name", name);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Host.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Host.java
deleted file mode 100644
index b3996df..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Host.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server40;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Host extends XMLElement {
- public Host() { }
-
- public String getAppBase() {
- return getAttributeValue("appBase");
- }
-
- public Context getContext(int index) {
- return (Context) findElement("Context", index);
- }
-
- public int getContextCount() {
- return sizeOfElement("Context");
- }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public String getName() {
- return getAttributeValue("name");
- }
-
- public void setAppBase(String appBase) {
- setAttributeValue("appBase", appBase);
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-
- public void setName(String name) {
- setAttributeValue("name", name);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Listener.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Listener.java
deleted file mode 100644
index a8f9061..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Listener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server40;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Listener extends XMLElement {
- public Listener() { }
-
- public String getClassName() {
- return getAttributeValue("className");
- }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public void setClassName(String className) {
- setAttributeValue("className", className);
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Server.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Server.java
deleted file mode 100644
index cc73793..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Server.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server40;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Server extends XMLElement {
- public Server() { }
-
- public String getDebug() {
- return getAttributeValue("debug");
- }
-
- public String getName() {
- return getAttributeValue("name");
- }
-
- public String getPort() {
- return getAttributeValue("port");
- }
-
- public Service getService(int index) {
- return (Service) findElement("Service", index);
- }
-
- public int getServiceCount() {
- return sizeOfElement("Service");
- }
-
- public String getShutdown() {
- return getAttributeValue("shutdown");
- }
-
- public void setDebug(String debug) {
- setAttributeValue("debug", debug);
- }
-
- public void setName(String name) {
- setAttributeValue("name", name);
- }
-
- public void setPort(String port) {
- setAttributeValue("port", port);
- }
-
- public void setShutdown(String shutdown) {
- setAttributeValue("shutdown", shutdown);
- }
-
- public Listener getListener(int index) {
- return (Listener) findElement("Listener", index);
- }
-
- public int getListenerCount() {
- return sizeOfElement("Listener");
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Service.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Service.java
deleted file mode 100644
index 99499ed..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Service.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jst.server.tomcat.core.internal.xml.server40;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.tomcat.core.internal.xml.*;
-/**
- *
- */
-public class Service extends XMLElement {
- public Service() { }
-
- public Connector getConnector(int index) {
- return (Connector) findElement("Connector", index);
- }
-
- public int getConnectorCount() {
- return sizeOfElement("Connector");
- }
-
- public Engine getEngine() {
- return (Engine) findElement("Engine");
- }
-
- public String getName() {
- return getAttributeValue("name");
- }
-
- public void setName(String name) {
- setAttributeValue("name", name);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/verifyInstall.properties b/plugins/org.eclipse.jst.server.tomcat.core/verifyInstall.properties
deleted file mode 100644
index 9434b15..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/verifyInstall.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-verify32install=lib/jasper.jar,lib/servlet.jar,bin,conf,webapps
-verify40install=bin/bootstrap.jar,conf,webapps
-verify41install=bin/bootstrap.jar,conf,webapps
-verify50install=bin/bootstrap.jar,conf,webapps
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/.classpath b/plugins/org.eclipse.jst.server.tomcat.ui/.classpath
deleted file mode 100644
index b0cfa1b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="tomcatui/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/.cvsignore b/plugins/org.eclipse.jst.server.tomcat.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/.project b/plugins/org.eclipse.jst.server.tomcat.ui/.project
deleted file mode 100644
index 5cbc5ba..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.tomcat.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.server.core</project>
- <project>org.eclipse.jst.server.core</project>
- <project>org.eclipse.jst.server.ui</project>
- <project>org.eclipse.jst.server.tomcat.core</project>
- <project>org.eclipse.wst.server.ui</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/build.properties b/plugins/org.eclipse.jst.server.tomcat.ui/build.properties
deleted file mode 100644
index ae57913..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- *.jar,\
- plugin.properties,\
- tomcatui.jar,\
- icons/
-source.tomcatui.jar = tomcatui/
-jars.compile.order =
-src.includes = build.properties
-output.tomcatui.jar = bin/
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_extension.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_extension.gif
deleted file mode 100644
index c585010..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_extension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_mapping.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_mapping.gif
deleted file mode 100644
index 0a8e4bf..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/port.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/port.gif
deleted file mode 100644
index 7a354b7..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/port.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/project_missing.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/project_missing.gif
deleted file mode 100644
index 0cb4c16..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/project_missing.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_32.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_32.gif
deleted file mode 100644
index bb4d02d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_40.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_40.gif
deleted file mode 100644
index e3745fc..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_40.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_41.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_41.gif
deleted file mode 100644
index ed45603..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_41.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_50.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_50.gif
deleted file mode 100644
index 0cac53e..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/server_50.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/tomcat_tools.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/tomcat_tools.gif
deleted file mode 100644
index 73bf959..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/tomcat_tools.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/web_module.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/web_module.gif
deleted file mode 100644
index bf20f70..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/web_module.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/icons/wizban/tomcat_wiz.gif b/plugins/org.eclipse.jst.server.tomcat.ui/icons/wizban/tomcat_wiz.gif
deleted file mode 100644
index 63a9599..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/icons/wizban/tomcat_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.properties b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.properties
deleted file mode 100644
index 90269da..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Apache Tomcat UI Support
-providerName=IBM
-
-# --------------- Editors ---------------
-
-editorName=Tomcat Server Editor
-
-# General text used in both editors
-editorRemove=Remove
-editorAdd=Add...
-editorEdit=Edit...
-editorBrowse=Browse...
-
-# --- Configuration Editor ---
-configurationEditorWebModulesPage=Modules
-configurationEditorWebModulesPageTitle=Web Modules
-configurationEditorWebModulesSection=Web Modules
-configurationEditorWebModulesDescription=Configure the Web Modules on this server.
-configurationEditorMimeMappingsPage=Mappings
-configurationEditorMimeMappingsPageTitle=MIME Mappings
-configurationEditorMimeMappingsSection=MIME Mappings
-configurationEditorMimeMappingsDescription=Configure MIME type mappings.
-configurationEditorPortsPage=Configuration
-configurationEditorPortsPageTitle=Tomcat Server Configuration
-configurationEditorNameSection=Server Configuration
-configurationEditorNameDescription=Enter settings for the server configuration.
-configurationEditorPortsSection=Ports
-configurationEditorPortsDescription=Modify the server ports.
-
-# Fields
-configurationEditorPortNameColumn=Port Name
-configurationEditorPortValueColumn=Port Number
-configurationEditorPathColumn=Path
-configurationEditorDocBaseColumn=Document Base
-configurationEditorProjectColumn=Project
-configurationEditorReloadColumn=Auto Reload
-configurationEditorProjectMissing={0} missing
-configurationEditorReloadEnabled=Enabled
-configurationEditorReloadDisabled=Disabled
-configurationEditorAddProjectModule=Add Web Project...
-configurationEditorAddExternalModule=Add External Web Module...
-
-# Add/Edit Mime Mapping dialog
-configurationEditorMimeMapppingDialogTitleEdit=Edit MIME Mapping
-configurationEditorMimeMapppingDialogTitleAdd=Add MIME Mapping
-configurationEditorMimeMapppingDialogMimeType=MIME type:
-configurationEditorMimeMapppingDialogMimeExtension=MIME extension:
-
-# Add/Edit Web Module dialog
-configurationEditorWebModuleDialogTitleEdit=Edit Web Module
-configurationEditorWebModuleDialogTitleAdd=Add Web Module
-configurationEditorWebModuleDialogProjects=Projects:
-configurationEditorWebModuleDialogPath=Path:
-configurationEditorWebModuleDialogDocumentBase=Document base:
-configurationEditorWebModuleDialogAutoReload=Auto reloading:
-configurationEditorWebModuleDialogReloadEnabled=Enabled
-configurationEditorWebModuleDialogSelectDirectory=Select the Web module directory.
-
-
-# --- Server Editor ---
-serverEditorGeneralPage=Server
-serverEditorGeneralPageTitle=Tomcat Server
-serverEditorGeneralSection=Server
-serverEditorGeneralDescription=Enter settings for the server.
-
-# Fields
-serverEditorSecure=Enable security
-serverEditorDebugMode=Enable Tomcat debug mode (v4.x and above only)
-serverEditorTestEnvironment=Run modules directly from the workspace (do not modify the Tomcat installation)
-
-# Actions (used in undo/redo menus)
-serverEditorActionSetSecure=set security
-serverEditorActionSetSecureDescription=Set the Tomcat security
-serverEditorActionSetDebugMode=set Tomcat debug mode
-serverEditorActionSetDebugModeDescription=Set Tomcat in debug mode
-serverEditorActionSetTestEnvironment=run modules from workspace
-serverEditorActionSetTestEnvironmentDescription=Run modules from the workspace
-
-
-# --------------- General UI ---------------
-
-runtimeName=Na&me:
-browse=B&rowse...
-installDir=Tomcat installation &directory:
-installedJRE=&JRE:
-installedJREs=&Installed JREs...
-selectInstallDir=Select Tomcat installation directory.
-
-# New Tomcat server wizard
-wizardTitle=Tomcat Server
-wizardDescription=Specify the installation directory
-
-
-# --------------- Errors and Info ---------------
-errorTitle=Tomcat Error
-errorInstallDir=The Tomcat installation directory is not correct. Edit the server and change the installation directory.
-errorJRE=The JRE could not be found. Edit the server and change the JRE location.
-errorDefaultInstallDir=Cannot create a Tomcat server because the installation directory is not known. Enter the installation directory in the Tomcat preferences.
-errorCancelled=Cancelled
-errorNameContainsWhitespace=Name should not begin or end with whitespace.
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
deleted file mode 100644
index f5e4dec..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin id="org.eclipse.jst.server.tomcat.ui"
- name="%pluginName"
- version="3.0.0"
- provider-name="%providerName"
- class="org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin">
-
- <runtime>
- <library name="tomcatui.jar">
- <export name="*"/>
- <packages prefixes="org.eclipse.jst.server.tomcat.ui"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" />
- <import plugin="org.eclipse.core.resources" />
- <import plugin="org.eclipse.ui" />
- <import plugin="org.eclipse.ui.ide" />
- <import plugin="org.eclipse.ui.editors" />
- <import plugin="org.eclipse.ui.forms" />
- <import plugin="org.eclipse.debug.core" />
- <import plugin="org.eclipse.debug.ui" />
- <import plugin="org.eclipse.jdt.core" />
- <import plugin="org.eclipse.jdt.debug" />
- <import plugin="org.eclipse.jdt.debug.ui" />
- <import plugin="org.eclipse.jdt.launching" />
- <import plugin="org.eclipse.wst.server.core" />
- <import plugin="org.eclipse.wst.server.ui" />
- <import plugin="org.eclipse.jst.server.core" />
- <import plugin="org.eclipse.jst.server.ui" />
- <import plugin="org.eclipse.jst.server.tomcat.core" />
- </requires>
-
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- id="org.eclipse.jst.server.tomcat.32"
- icon="icons/obj16/server_32.gif"
- typeIds="org.eclipse.jst.server.tomcat.32.runtime"/>
- <image
- id="org.eclipse.jst.server.tomcat.40"
- icon="icons/obj16/server_40.gif"
- typeIds="org.eclipse.jst.server.tomcat.40.runtime"/>
- <image
- id="org.eclipse.jst.server.tomcat.41"
- icon="icons/obj16/server_41.gif"
- typeIds="org.eclipse.jst.server.tomcat.41.runtime"/>
- <image
- id="org.eclipse.jst.server.tomcat.50"
- icon="icons/obj16/server_50.gif"
- typeIds="org.eclipse.jst.server.tomcat.50.runtime"/>
- <image
- id="org.eclipse.jst.server.tomcat.55"
- icon="icons/obj16/server_55.gif"
- typeIds="org.eclipse.jst.server.tomcat.55.runtime"/>
-
- <image
- id="org.eclipse.jst.server.tomcat.32"
- icon="icons/obj16/server_32.gif"
- typeIds="org.eclipse.jst.server.tomcat.32"/>
- <image
- id="org.eclipse.jst.server.tomcat.40"
- icon="icons/obj16/server_40.gif"
- typeIds="org.eclipse.jst.server.tomcat.40"/>
- <image
- id="org.eclipse.jst.server.tomcat.41"
- icon="icons/obj16/server_41.gif"
- typeIds="org.eclipse.jst.server.tomcat.41"/>
- <image
- id="org.eclipse.jst.server.tomcat.50"
- icon="icons/obj16/server_50.gif"
- typeIds="org.eclipse.jst.server.tomcat.50"/>
- <image
- id="org.eclipse.jst.server.tomcat.55"
- icon="icons/obj16/server_55.gif"
- typeIds="org.eclipse.jst.server.tomcat.55"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.ui.editorPages">
- <page
- id="org.eclipse.jst.server.tomcat.configuration.editor.webmodule"
- order="20"
- name="%configurationEditorWebModulesPage"
- typeIds="org.eclipse.jst.server.tomcat.*"
- class="org.eclipse.jst.server.tomcat.ui.internal.editor.ConfigurationWebModuleEditorFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.ui.editorPageSections">
- <section
- id="org.eclipse.jst.server.tomcat.server.editor.general"
- order="0"
- insertionId="org.eclipse.wst.server.editor.overview.left"
- typeIds="org.eclipse.jst.server.tomcat.*"
- class="org.eclipse.jst.server.tomcat.ui.internal.editor.ServerGeneralEditorSectionFactory"/>
- <section
- id="org.eclipse.jst.server.tomcat.configuration.editor.port"
- order="10"
- insertionId="org.eclipse.wst.server.editor.overview.right"
- typeIds="org.eclipse.jst.server.tomcat.*"
- class="org.eclipse.jst.server.tomcat.ui.internal.editor.ConfigurationPortEditorSectionFactory"/>
- <section
- id="org.eclipse.jst.server.tomcat.configuration.editor.mime"
- order="20"
- insertionId="org.eclipse.wst.server.editor.overview.right"
- typeIds="org.eclipse.jst.server.tomcat.*"
- class="org.eclipse.jst.server.tomcat.ui.internal.editor.ConfigurationMimeEditorSectionFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.ui.wizardFragments">
- <fragment
- id="org.eclipse.jst.server.tomcat.32.runtime"
- typeIds="org.eclipse.jst.server.tomcat.32.runtime"
- class="org.eclipse.jst.server.tomcat.ui.internal.TomcatRuntimeWizardFragment"/>
- <fragment
- id="org.eclipse.jst.server.tomcat.40.runtime"
- typeIds="org.eclipse.jst.server.tomcat.40.runtime"
- class="org.eclipse.jst.server.tomcat.ui.internal.TomcatRuntimeWizardFragment"/>
- <fragment
- id="org.eclipse.jst.server.tomcat.41.runtime"
- typeIds="org.eclipse.jst.server.tomcat.41.runtime"
- class="org.eclipse.jst.server.tomcat.ui.internal.TomcatRuntimeWizardFragment"/>
- <fragment
- id="org.eclipse.jst.server.tomcat.50.runtime"
- typeIds="org.eclipse.jst.server.tomcat.50.runtime"
- class="org.eclipse.jst.server.tomcat.ui.internal.TomcatRuntimeWizardFragment"/>
- <fragment
- id="org.eclipse.jst.server.tomcat.55.runtime"
- typeIds="org.eclipse.jst.server.tomcat.55.runtime"
- class="org.eclipse.jst.server.tomcat.ui.internal.TomcatRuntimeWizardFragment"/>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- id="org.eclipse.jst.server.tomcat.ui.launchConfigurationTypeImage"
- configTypeID="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- icon="icons/obj16/tomcat_tools.gif">
- </launchConfigurationTypeImage>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- id="org.eclipse.jst.server.tomcat.ui.launchConfigurationTabGroup"
- type="org.eclipse.jst.server.tomcat.core.launchConfigurationType"
- class="org.eclipse.jst.server.tomcat.ui.internal.TomcatLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/ContextIds.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/ContextIds.java
deleted file mode 100644
index 9279b0d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/ContextIds.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * Constant ids for context help.
- */
-public interface ContextIds {
- public static final String SERVER_EDITOR = TomcatUIPlugin.PLUGIN_ID + ".teig0000";
- public static final String SERVER_EDITOR_TEST_ENVIRONMENT = TomcatUIPlugin.PLUGIN_ID + ".teig0002";
- public static final String SERVER_EDITOR_SECURE = TomcatUIPlugin.PLUGIN_ID + ".teig0004";
- public static final String SERVER_EDITOR_DEBUG_MODE = TomcatUIPlugin.PLUGIN_ID + ".teig0006";
-
- public static final String CONFIGURATION_EDITOR_WEBMODULES = TomcatUIPlugin.PLUGIN_ID + ".tecw0000";
- public static final String CONFIGURATION_EDITOR_WEBMODULES_LIST = TomcatUIPlugin.PLUGIN_ID + ".tecw0002";
- public static final String CONFIGURATION_EDITOR_WEBMODULES_ADD_PROJECT = TomcatUIPlugin.PLUGIN_ID + ".tecw0004";
- public static final String CONFIGURATION_EDITOR_WEBMODULES_ADD_EXTERNAL = TomcatUIPlugin.PLUGIN_ID + ".tecw0006";
- public static final String CONFIGURATION_EDITOR_WEBMODULES_EDIT = TomcatUIPlugin.PLUGIN_ID + ".tecw0008";
- public static final String CONFIGURATION_EDITOR_WEBMODULES_REMOVE = TomcatUIPlugin.PLUGIN_ID + ".tecw0010";
-
- public static final String CONFIGURATION_EDITOR_WEBMODULE_DIALOG = TomcatUIPlugin.PLUGIN_ID + ".tdwm0000";
- public static final String CONFIGURATION_EDITOR_WEBMODULE_DIALOG_PROJECT = TomcatUIPlugin.PLUGIN_ID + ".tdpr0002";
- public static final String CONFIGURATION_EDITOR_WEBMODULE_DIALOG_PATH = TomcatUIPlugin.PLUGIN_ID + ".tdpr0004";
- public static final String CONFIGURATION_EDITOR_WEBMODULE_DIALOG_DOCBASE = TomcatUIPlugin.PLUGIN_ID + ".tdpr0006";
- public static final String CONFIGURATION_EDITOR_WEBMODULE_DIALOG_RELOAD = TomcatUIPlugin.PLUGIN_ID + ".tdpr0008";
-
- public static final String CONFIGURATION_EDITOR_MAPPINGS = TomcatUIPlugin.PLUGIN_ID + ".tecm0000";
- public static final String CONFIGURATION_EDITOR_MAPPINGS_LIST = TomcatUIPlugin.PLUGIN_ID + ".tecm0002";
- public static final String CONFIGURATION_EDITOR_MAPPINGS_ADD = TomcatUIPlugin.PLUGIN_ID + ".tecm0004";
- public static final String CONFIGURATION_EDITOR_MAPPINGS_EDIT = TomcatUIPlugin.PLUGIN_ID + ".tecm0006";
- public static final String CONFIGURATION_EDITOR_MAPPINGS_REMOVE = TomcatUIPlugin.PLUGIN_ID + ".tecm0008";
-
- public static final String CONFIGURATION_EDITOR_MAPPING_DIALOG = TomcatUIPlugin.PLUGIN_ID + ".tdmm0000";
- public static final String CONFIGURATION_EDITOR_MAPPING_DIALOG_TYPE = TomcatUIPlugin.PLUGIN_ID + ".tdmm0002";
- public static final String CONFIGURATION_EDITOR_MAPPING_DIALOG_EXTENSION = TomcatUIPlugin.PLUGIN_ID + ".tdmm0004";
-
- public static final String CONFIGURATION_EDITOR_PORTS = TomcatUIPlugin.PLUGIN_ID + ".tecp0000";
- public static final String CONFIGURATION_EDITOR_PORTS_LIST = TomcatUIPlugin.PLUGIN_ID + ".tecp0002";
-
- public static final String RUNTIME = TomcatUIPlugin.PLUGIN_ID + ".twnr0000";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/SWTUtil.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/SWTUtil.java
deleted file mode 100644
index 4de2a3e..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/SWTUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-/**
- * SWT Utility class.
- */
-public class SWTUtil {
- private static FontMetrics fontMetrics;
-
- protected static void initializeDialogUnits(Control testControl) {
- // Compute and store a font metric
- GC gc = new GC(testControl);
- gc.setFont(JFaceResources.getDialogFont());
- fontMetrics = gc.getFontMetrics();
- gc.dispose();
- }
-
- /**
- * Returns a width hint for a button control.
- */
- protected static int getButtonWidthHint(Button button) {
- int widthHint = Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_WIDTH);
- return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
- }
-
- public static Button createButton(Composite comp, String label) {
- Button b = new Button(comp, SWT.PUSH);
- b.setText(label);
- if (fontMetrics == null)
- initializeDialogUnits(comp);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = getButtonWidthHint(b);
- data.heightHint = Dialog.convertVerticalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_HEIGHT);
- b.setLayoutData(data);
- return b;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatLaunchConfigurationTabGroup.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatLaunchConfigurationTabGroup.java
deleted file mode 100644
index 6fbb49d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-
-import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
-/**
- *
- */
-public class TomcatLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {
- /**
- * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
- */
- public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
- ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[6];
- tabs[0] = new ServerLaunchConfigurationTab(new String[] { "org.eclipse.jst.server.tomcat" });
- tabs[0].setLaunchConfigurationDialog(dialog);
- tabs[1] = new JavaArgumentsTab();
- tabs[1].setLaunchConfigurationDialog(dialog);
- tabs[2] = new JavaClasspathTab();
- tabs[2].setLaunchConfigurationDialog(dialog);
- tabs[3] = new SourceLookupTab();
- tabs[3].setLaunchConfigurationDialog(dialog);
- tabs[4] = new EnvironmentTab();
- tabs[4].setLaunchConfigurationDialog(dialog);
- tabs[5] = new CommonTab();
- tabs[5].setLaunchConfigurationDialog(dialog);
- setTabs(tabs);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeComposite.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeComposite.java
deleted file mode 100644
index ff02805..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeComposite.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.server.tomcat.core.ITomcatRuntimeWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatRuntimeWorkingCopy;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-/**
- * Wizard page to set the server install directory.
- */
-public class TomcatRuntimeComposite extends Composite {
- protected IRuntimeWorkingCopy runtimeWC;
- protected ITomcatRuntimeWorkingCopy runtime;
-
- protected IWizardHandle wizard;
-
- protected Text installDir;
- protected Text name;
- protected Combo combo;
- protected List installedJREs;
- protected String[] jreNames;
- protected int defaultVMIndex;
-
- /**
- * TomcatRuntimeWizardPage constructor comment.
- * @param runtime
- */
- protected TomcatRuntimeComposite(Composite parent, IWizardHandle wizard) {
- super(parent, SWT.NONE);
- this.wizard = wizard;
-
- wizard.setTitle(TomcatUIPlugin.getResource("%wizardTitle"));
- wizard.setDescription(TomcatUIPlugin.getResource("%wizardDescription"));
- wizard.setImageDescriptor(TomcatUIPlugin.getImageDescriptor(TomcatUIPlugin.IMG_WIZ_TOMCAT));
-
- createControl();
- }
-
- protected void setRuntime(IRuntimeWorkingCopy newRuntime) {
- if (newRuntime == null) {
- runtimeWC = null;
- runtime = null;
- } else {
- runtimeWC = newRuntime;
- runtime = (TomcatRuntimeWorkingCopy) newRuntime.getWorkingCopyDelegate();
- }
-
- init();
- validate();
- }
-
- /**
- * Provide a wizard page to change the Tomcat installation directory.
- *
- * @param parent the parent composite
- * @return the new control
- */
- protected void createControl() {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- setLayout(layout);
- setLayoutData(new GridData(GridData.FILL_BOTH));
- WorkbenchHelp.setHelp(this, ContextIds.RUNTIME);
-
- Label label = new Label(this, SWT.NONE);
- label.setText(TomcatUIPlugin.getResource("%runtimeName"));
- GridData data = new GridData();
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- name = new Text(this, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- name.setLayoutData(data);
- name.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- runtimeWC.setName(name.getText());
- validate();
- }
- });
-
- label = new Label(this, SWT.NONE);
- label.setText(TomcatUIPlugin.getResource("%installDir"));
- data = new GridData();
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- installDir = new Text(this, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- installDir.setLayoutData(data);
- installDir.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- runtimeWC.setLocation(new Path(installDir.getText()));
- validate();
- }
- });
-
- Button browse = SWTUtil.createButton(this, TomcatUIPlugin.getResource("%browse"));
- browse.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent se) {
- DirectoryDialog dialog = new DirectoryDialog(TomcatRuntimeComposite.this.getShell());
- dialog.setMessage(TomcatUIPlugin.getResource("%selectInstallDir"));
- dialog.setFilterPath(installDir.getText());
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- installDir.setText(selectedDirectory);
- }
- });
-
- updateJREs();
-
- // JDK location
- label = new Label(this, SWT.NONE);
- label.setText(TomcatUIPlugin.getResource("%installedJRE"));
- data = new GridData();
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- combo = new Combo(this, SWT.DROP_DOWN | SWT.READ_ONLY);
- combo.setItems(jreNames);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- combo.setLayoutData(data);
-
- combo.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- int sel = combo.getSelectionIndex();
- IVMInstall vmInstall = (IVMInstall) installedJREs.get(sel);
- runtime.setVMInstall(vmInstall.getVMInstallType().getId(), vmInstall.getId());
- validate();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
-
- Button button = SWTUtil.createButton(this, TomcatUIPlugin.getResource("%installedJREs"));
- button.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String currentVM = combo.getText();
- if (showPreferencePage()) {
- updateJREs();
- combo.setItems(jreNames);
- combo.setText(currentVM);
- if (combo.getSelectionIndex() == -1)
- combo.select(defaultVMIndex);
- }
- }
- });
-
- init();
- validate();
-
- Dialog.applyDialogFont(this);
-
- name.forceFocus();
- }
-
- protected void updateJREs() {
- // get all installed JVMs
- installedJREs = new ArrayList();
- IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
- int size = vmInstallTypes.length;
- for (int i = 0; i < size; i++) {
- IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls();
- int size2 = vmInstalls.length;
- for (int j = 0; j < size2; j++) {
- installedJREs.add(vmInstalls[j]);
- }
- }
-
- // get names
- size = installedJREs.size();
- jreNames = new String[size];
- for (int i = 0; i < size; i++) {
- IVMInstall vmInstall = (IVMInstall) installedJREs.get(i);
- jreNames[i] = vmInstall.getName();
- }
-
- IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
- defaultVMIndex = installedJREs.indexOf(defaultVM);
- }
-
- protected boolean showPreferencePage() {
- PreferenceManager manager = PlatformUI.getWorkbench().getPreferenceManager();
- IPreferenceNode node = manager.find("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage").findSubNode("org.eclipse.jdt.debug.ui.preferences.VMPreferencePage");
- PreferenceManager manager2 = new PreferenceManager();
- manager2.addToRoot(node);
- final PreferenceDialog dialog = new PreferenceDialog(getShell(), manager2);
- final boolean[] result = new boolean[] { false };
- BusyIndicator.showWhile(getDisplay(), new Runnable() {
- public void run() {
- dialog.create();
- if (dialog.open() == Window.OK)
- result[0] = true;
- }
- });
- return result[0];
- }
-
- protected void init() {
- if (name == null || runtime == null)
- return;
-
- if (runtimeWC.getName() != null)
- name.setText(runtimeWC.getName());
- else
- name.setText("");
-
- if (runtimeWC.getLocation() != null)
- installDir.setText(runtimeWC.getLocation().toOSString());
- else
- installDir.setText("");
-
- // set selection
- boolean found = false;
- int size = installedJREs.size();
- for (int i = 0; i < size; i++) {
- IVMInstall vmInstall = (IVMInstall) installedJREs.get(i);
- if (vmInstall.getVMInstallType().getId().equals(runtime.getVMInstallTypeId())
- && vmInstall.getId().equals(runtime.getVMInstallId())) {
- combo.select(i);
- found = true;
- }
- }
- if (!found)
- combo.select(defaultVMIndex);
- }
-
- protected void validate() {
- if (runtime == null) {
- wizard.setMessage("", IMessageProvider.ERROR);
- return;
- }
-
- IStatus status = runtime.validate();
- if (status == null || status.isOK())
- wizard.setMessage(null, IMessageProvider.NONE);
- else
- wizard.setMessage(status.getMessage(), IMessageProvider.ERROR);
- wizard.update();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java
deleted file mode 100644
index eb4fb6b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.server.tomcat.core.ITomcatRuntimeWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ITaskModel;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-/**
- *
- */
-public class TomcatRuntimeWizardFragment extends WizardFragment {
- protected TomcatRuntimeComposite comp;
-
- public TomcatRuntimeWizardFragment() { }
-
- public boolean hasComposite() {
- return true;
- }
-
- public boolean isComplete() {
- IRuntimeWorkingCopy runtime = (IRuntimeWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_RUNTIME);
-
- if (runtime == null)
- return false;
- IStatus status = runtime.validate();
- return (status != null && status.isOK());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.task.WizardFragment#createComposite()
- */
- public Composite createComposite(Composite parent, IWizardHandle wizard) {
- comp = new TomcatRuntimeComposite(parent, wizard);
- return comp;
- }
-
- public void enter() {
- if (comp != null) {
- IRuntimeWorkingCopy runtime = (IRuntimeWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_RUNTIME);
- comp.setRuntime(runtime);
- }
- }
-
- public void exit() {
- IRuntimeWorkingCopy runtime = (IRuntimeWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_RUNTIME);
- IPath path = runtime.getLocation();
- ITomcatRuntimeWorkingCopy tr = (ITomcatRuntimeWorkingCopy) runtime.getWorkingCopyDelegate();
- if (tr.validate().isOK())
- TomcatPlugin.setPreference("location" + runtime.getRuntimeType().getId(), path.toString());
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatUIPlugin.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatUIPlugin.java
deleted file mode 100644
index 53fe87d..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatUIPlugin.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-/**
- * The actual Tomcat plugin. It allows the rest of the classes
- * to load images and get a handle to the desktop.
- */
-public class TomcatUIPlugin extends AbstractUIPlugin {
- protected static TomcatUIPlugin singleton;
-
- protected Map imageDescriptors = new HashMap();
-
- // base url for icons
- private static URL ICON_BASE_URL;
-
- private static final String URL_OBJ = "obj16/";
- private static final String URL_WIZBAN = "wizban/";
-
- public static final String PLUGIN_ID = "org.eclipse.tomcat";
-
- public static final String IMG_WIZ_TOMCAT = "wizTomcat";
-
- public static final String IMG_WEB_MODULE = "webModule";
- public static final String IMG_MIME_MAPPING = "mimeMapping";
- public static final String IMG_MIME_EXTENSION = "mimeExtension";
- public static final String IMG_PORT = "port";
- public static final String IMG_PROJECT_MISSING = "projectMissing";
-
- public static final String PREF_TOMCAT32_INSTALL_DIR = "tomcat32install";
- public static final String PREF_TOMCAT40_INSTALL_DIR = "tomcat40install";
- public static final String PREF_TOMCAT41_INSTALL_DIR = "tomcat41install";
- public static final String PREF_TOMCAT50_INSTALL_DIR = "tomcat50install";
- public static final String PREF_JDK_INSTALL_DIR = "jdkinstall";
-
- /**
- * TomcatUIPlugin constructor comment.
- */
- public TomcatUIPlugin() {
- super();
- singleton = this;
- }
-
- protected ImageRegistry createImageRegistry() {
- ImageRegistry registry = new ImageRegistry();
-
- registerImage(registry, IMG_WIZ_TOMCAT, URL_WIZBAN + "tomcat_wiz.gif");
-
- registerImage(registry, IMG_WEB_MODULE, URL_OBJ + "web_module.gif");
- registerImage(registry, IMG_MIME_MAPPING, URL_OBJ + "mime_mapping.gif");
- registerImage(registry, IMG_MIME_EXTENSION, URL_OBJ + "mime_extension.gif");
- registerImage(registry, IMG_PORT, URL_OBJ + "port.gif");
- registerImage(registry, IMG_PROJECT_MISSING, URL_OBJ + "project_missing.gif");
-
- return registry;
- }
-
- /**
- * Return the image with the given key from the image registry.
- * @param key java.lang.String
- * @return org.eclipse.jface.parts.IImage
- */
- public static Image getImage(String key) {
- return getInstance().getImageRegistry().get(key);
- }
-
- /**
- * Return the image with the given key from the image registry.
- * @param key java.lang.String
- * @return org.eclipse.jface.parts.IImage
- */
- public static ImageDescriptor getImageDescriptor(String key) {
- try {
- getInstance().getImageRegistry();
- return (ImageDescriptor) getInstance().imageDescriptors.get(key);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * Returns the singleton instance of this plugin.
- * @return org.eclipse.jst.server.tomcat.internal.TomcatUIPlugin
- */
- public static TomcatUIPlugin getInstance() {
- return singleton;
- }
-
- /**
- * Convenience method for logging.
- *
- * @param status org.eclipse.core.runtime.IStatus
- */
- public static void log(IStatus status) {
- getInstance().getLog().log(status);
- }
-
- /**
- * Returns the translated String found with the given key.
- * @return java.lang.String
- * @param key java.lang.String
- */
- public static String getResource(String key) {
- try {
- return Platform.getResourceString(getInstance().getBundle(), key);
- } catch (Exception e) {
- return key;
- }
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given object.
- * @return java.lang.String
- * @param key java.lang.String
- * @param obj java.lang.Object[]
- */
- public static String getResource(String key, Object[] obj) {
- try {
- return MessageFormat.format(getResource(key), obj);
- } catch (Exception e) {
- return key;
- }
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given object.
- * @return java.lang.String
- * @param key java.lang.String
- * @param obj java.lang.Object[]
- */
- public static String getResource(String key, String arg) {
- return getResource(key, new String[] { arg });
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given object.
- * @return java.lang.String
- * @param key java.lang.String
- * @param obj java.lang.Object[]
- */
- public static String getResource(String key, String arg1, String arg2) {
- return getResource(key, new String[] { arg1, arg2 });
- }
-
- /**
- * Register an image with the registry.
- * @param key java.lang.String
- * @param partialURL java.lang.String
- */
- private void registerImage(ImageRegistry registry, String key, String partialURL) {
- if (ICON_BASE_URL == null) {
- String pathSuffix = "icons/";
- ICON_BASE_URL = singleton.getBundle().getEntry(pathSuffix);
- }
-
- try {
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(ICON_BASE_URL, partialURL));
- registry.put(key, id);
- imageDescriptors.put(key, id);
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Error registering image", e);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Trace.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Trace.java
deleted file mode 100644
index b9f1fbe..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Trace.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * Helper class to route trace output.
- */
-public class Trace {
- public static byte CONFIG = 0;
- public static byte WARNING = 1;
- public static byte SEVERE = 2;
- public static byte FINEST = 3;
- public static byte FINER = 4;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(byte level, String s) {
- Trace.trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param s java.lang.String
- * @param t java.lang.Throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (!TomcatUIPlugin.getInstance().isDebugging())
- return;
-
- System.out.println(s);
- if (t != null)
- t.printStackTrace();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(String s) {
- trace(s, null);
- }
-
- /**
- * Trace the given exception.
- *
- * @param s java.lang.String
- * @param e java.lang.Throwable
- */
- public static void trace(String s, Throwable t) {
- trace(FINEST, s, t);
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java
deleted file mode 100644
index f89622e..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java
+++ /dev/null
@@ -1,415 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.beans.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.server.ui.editor.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.MimeMapping;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.internal.command.*;
-import org.eclipse.jst.server.tomcat.ui.internal.ContextIds;
-import org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.help.WorkbenchHelp;
-/**
- * Tomcat configuration mime editor section.
- */
-public class ConfigurationMimeEditorSection extends ServerResourceEditorSection {
- protected ITomcatConfigurationWorkingCopy tomcatConfiguration;
-
- protected boolean updating;
-
- protected PropertyChangeListener listener;
-
- protected Tree mimeTypes;
- protected int index = -1;
- protected List mappings;
- protected Button add;
- protected Button remove;
- protected Button edit;
-
- /**
- * ConfigurationMimeEditorSection constructor comment.
- */
- protected ConfigurationMimeEditorSection() {
- super();
- }
-
- /**
- *
- */
- protected void addChangeListener() {
- listener = new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if (TomcatConfiguration.ADD_MAPPING_PROPERTY.equals(event.getPropertyName())) {
- Integer in = (Integer) event.getOldValue();
- MimeMapping mapping = (MimeMapping) event.getNewValue();
- addMimeMapping(in.intValue(), mapping);
- } else if (TomcatConfiguration.REMOVE_MAPPING_PROPERTY.equals(event.getPropertyName())) {
- Integer in = (Integer) event.getNewValue();
- removeMimeMapping(in.intValue());
- } else if (TomcatConfiguration.MODIFY_MAPPING_PROPERTY.equals(event.getPropertyName())) {
- Integer in = (Integer) event.getOldValue();
- MimeMapping mapping = (MimeMapping) event.getNewValue();
- modifyMimeMapping(in.intValue(), mapping);
- }
- }
- };
- serverConfiguration.addPropertyChangeListener(listener);
- }
-
- public void createSection(Composite parent) {
- super.createSection(parent);
-
- FormToolkit toolkit = getFormToolkit(parent.getDisplay());
-
- Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.TITLE_BAR|Section.DESCRIPTION|ExpandableComposite.FOCUS_TITLE);
- section.setText(TomcatUIPlugin.getResource("%configurationEditorMimeMappingsSection"));
- section.setDescription(TomcatUIPlugin.getResource("%configurationEditorMimeMappingsDescription"));
- section.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
-
- Composite composite = toolkit.createComposite(section);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 5;
- layout.marginWidth = 10;
- layout.verticalSpacing = 5;
- layout.horizontalSpacing = 15;
- composite.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
- WorkbenchHelp.setHelp(composite, ContextIds.CONFIGURATION_EDITOR_MAPPINGS);
- toolkit.paintBordersFor(composite);
- section.setClient(composite);
-
- mimeTypes = toolkit.createTree(composite, SWT.V_SCROLL | SWT.SINGLE | SWT.H_SCROLL);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- data.widthHint = 220;
- data.heightHint = 200;
- mimeTypes.setLayoutData(data);
- WorkbenchHelp.setHelp(mimeTypes, ContextIds.CONFIGURATION_EDITOR_MAPPINGS_LIST);
-
- // add listener to the table
- mimeTypes.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- selectMimeMapping();
- }
- });
-
- Composite buttonComp = toolkit.createComposite(composite);
- layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- buttonComp.setLayout(layout);
- buttonComp.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- add = toolkit.createButton(buttonComp, TomcatUIPlugin.getResource("%editorAdd"), SWT.PUSH);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = 75;
- add.setLayoutData(data);
-
- add.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- MimeMappingDialog dialog = new MimeMappingDialog(getShell());
- dialog.open();
- if (dialog.getReturnCode() == IDialogConstants.OK_ID) {
- commandManager.executeCommand(new AddMimeMappingCommand(tomcatConfiguration, dialog.getMimeMapping()));
- }
- }
- });
- WorkbenchHelp.setHelp(add, ContextIds.CONFIGURATION_EDITOR_MAPPINGS_ADD);
-
- edit = toolkit.createButton(buttonComp, TomcatUIPlugin.getResource("%editorEdit"), SWT.PUSH);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = 75;
- edit.setLayoutData(data);
- edit.setEnabled(false);
-
- edit.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (index < 0)
- return;
- MimeMappingDialog dialog = new MimeMappingDialog(getShell(), (MimeMapping) tomcatConfiguration.getMimeMappings().get(index));
- dialog.open();
- if (dialog.getReturnCode() == IDialogConstants.OK_ID) {
- commandManager.executeCommand(new ModifyMimeMappingCommand(tomcatConfiguration, index, dialog.getMimeMapping()));
- }
- }
- });
- WorkbenchHelp.setHelp(edit, ContextIds.CONFIGURATION_EDITOR_MAPPINGS_EDIT);
-
- remove = toolkit.createButton(buttonComp, TomcatUIPlugin.getResource("%editorRemove"), SWT.PUSH);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = 75;
- remove.setLayoutData(data);
- remove.setEnabled(false);
-
- remove.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (index < 0)
- return;
- commandManager.executeCommand(new RemoveMimeMappingCommand(tomcatConfiguration, index));
- index = -1;
- edit.setEnabled(false);
- remove.setEnabled(false);
- }
- });
- WorkbenchHelp.setHelp(remove, ContextIds.CONFIGURATION_EDITOR_MAPPINGS_REMOVE);
-
- initialize();
- }
-
- public void dispose() {
- if (serverConfiguration != null)
- serverConfiguration.removePropertyChangeListener(listener);
- }
-
- public void init(IEditorSite site, IEditorInput input) {
- super.init(site, input);
-
- if (serverConfiguration != null) {
- tomcatConfiguration = (ITomcatConfigurationWorkingCopy) serverConfiguration.getWorkingCopyDelegate();
- addChangeListener();
- }
- initialize();
- }
-
- /**
- * Initialize the fields in this editor.
- */
- protected void initialize() {
- if (mimeTypes == null)
- return;
-
- mimeTypes.removeAll();
-
- mappings = tomcatConfiguration.getMimeMappings();
-
- // sort mappings
- int size = mappings.size();
- int[] map = new int[size];
- for (int i = 0; i < size; i++)
- map[i] = i;
-
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- MimeMapping mappingA = (MimeMapping) mappings.get(map[i]);
- MimeMapping mappingB = (MimeMapping) mappings.get(map[j]);
- if (mappingA.getMimeType().compareTo(mappingB.getMimeType()) > 0 ||
- ((mappingA.getMimeType().equals(mappingB.getMimeType())) &&
- mappingA.getExtension().compareTo(mappingB.getExtension()) > 0)) {
- int temp = map[i];
- map[i] = map[j];
- map[j] = temp;
- }
- }
- }
-
- // display them
- Map hash = new HashMap();
-
- for (int i = 0; i < size; i++) {
- MimeMapping mapping = (MimeMapping) mappings.get(map[i]);
- // get parent node
- TreeItem parent = (TreeItem) hash.get(mapping.getMimeType());
- if (parent == null) {
- parent = new TreeItem(mimeTypes, SWT.NONE);
- parent.setText(mapping.getMimeType());
- parent.setImage(TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_MIME_MAPPING));
- hash.put(mapping.getMimeType(), parent);
- }
-
- // add node
- TreeItem item = new TreeItem(parent, SWT.NONE);
- item.setText(mapping.getExtension());
- item.setImage(TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_MIME_EXTENSION));
- item.setData(new Integer(map[i]));
- }
-
- if (readOnly) {
- add.setEnabled(false);
- edit.setEnabled(false);
- remove.setEnabled(false);
- } else {
- add.setEnabled(true);
- selectMimeMapping();
- }
- }
-
- protected void validate() {
- }
-
- /**
- * Add a mime mapping.
- *
- * @param index int
- * @param map org.eclipse.jst.server.tomcat.MimeMapping
- */
- protected void addMimeMapping(int index2, MimeMapping map) {
- mappings.add(index2, map);
-
- // correct all index numbers
- int size = mimeTypes.getItemCount();
- TreeItem[] parents = mimeTypes.getItems();
- for (int i = 0; i < size; i++) {
- TreeItem parent = parents[i];
-
- int size2 = parent.getItemCount();
- TreeItem[] children = parent.getItems();
- for (int j = 0; j < size2; j++) {
- Integer in = (Integer) children[j].getData();
- if (in.intValue() >= index2)
- children[j].setData(new Integer(in.intValue() + 1));
- }
- }
-
- // check if there is a parent. If so, just add a new child
- for (int i = 0; i < size; i++) {
- TreeItem parent = parents[i];
- if (parent.getText().equals(map.getMimeType())) {
- TreeItem item = new TreeItem(parent, SWT.NONE);
- item.setText(map.getExtension());
- item.setImage(TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_MIME_EXTENSION));
- item.setData(new Integer(index2));
- mimeTypes.showItem(item);
- return;
- }
- }
-
- // if not, add a new parent and child to the end
- TreeItem parent = new TreeItem(mimeTypes, SWT.NONE);
- parent.setText(map.getMimeType());
- parent.setImage(TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_MIME_MAPPING));
-
- TreeItem item = new TreeItem(parent, SWT.NONE);
- item.setText(map.getExtension());
- item.setImage(TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_MIME_EXTENSION));
- item.setData(new Integer(index2));
- mimeTypes.showItem(item);
- }
-
- /**
- *
- * @param index int
- * @param map org.eclipse.jst.server.tomcat.MimeMapping
- */
- protected void modifyMimeMapping(int index2, MimeMapping map) {
- MimeMapping oldMap = (MimeMapping) mappings.get(index2);
- mappings.set(index2, map);
-
- int size = mimeTypes.getItemCount();
- TreeItem[] parents = mimeTypes.getItems();
-
- if (oldMap.getMimeType().equals(map.getMimeType())) {
- for (int i = 0; i < size; i++) {
- TreeItem parent = parents[i];
-
- if (parent.getText().equals(map.getMimeType())) {
- int size2 = parent.getItemCount();
- TreeItem[] children = parent.getItems();
- for (int j = 0; j < size2; j++) {
- Integer in = (Integer) children[j].getData();
- if (in.intValue() == index2) {
- children[j].setText(map.getExtension());
- children[j].setData(new Integer(index2));
- mimeTypes.showItem(children[j]);
- return;
- }
- }
- }
- }
- return;
- }
-
- // otherwise, let's try a remove and an add
- removeMimeMapping(index2);
- addMimeMapping(index2, map);
- }
-
- /**
- * Remove the mime mapping at the given index.
- * @param i int
- */
- protected void removeMimeMapping(int index2) {
- mappings.remove(index2);
-
- // remove item
- int size = mimeTypes.getItemCount();
- TreeItem[] parents = mimeTypes.getItems();
- for (int i = 0; i < size; i++) {
- TreeItem parent = parents[i];
-
- int size2 = parent.getItemCount();
- TreeItem[] children = parent.getItems();
- for (int j = 0; j < size2; j++) {
- Integer in = (Integer) children[j].getData();
- if (in.intValue() == index2) {
- children[j].dispose();
- if (size2 == 1)
- parent.dispose();
- i += size;
- j += size2;
- }
- }
- }
-
- // correct all index numbers
- size = mimeTypes.getItemCount();
- parents = mimeTypes.getItems();
- for (int i = 0; i < size; i++) {
- TreeItem parent = parents[i];
-
- int size2 = parent.getItemCount();
- TreeItem[] children = parent.getItems();
- for (int j = 0; j < size2; j++) {
- Integer in = (Integer) children[j].getData();
- if (in.intValue() > index2)
- children[j].setData(new Integer(in.intValue() - 1));
- }
- }
- }
-
- /**
- *
- */
- protected void selectMimeMapping() {
- if (readOnly)
- return;
-
- try {
- TreeItem item = mimeTypes.getSelection()[0];
- Integer in = (Integer) item.getData();
- index = in.intValue();
-
- remove.setEnabled(true);
- edit.setEnabled(true);
- } catch (Exception e) {
- index = -1;
- remove.setEnabled(false);
- edit.setEnabled(false);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSectionFactory.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSectionFactory.java
deleted file mode 100644
index e5cefe1..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSectionFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.ui.editor.*;
-/**
- *
- */
-public class ConfigurationMimeEditorSectionFactory implements IServerEditorPageSectionFactoryDelegate {
- /*
- * @see IServerEditorPartFactoryDelegate#shouldDisplay(IServer, IServerConfiguration)
- */
- public boolean shouldCreateSection(IServer server, IServerConfiguration configuration) {
- return (configuration != null);
- }
-
- /*
- * @see IServerEditorPartFactoryDelegate#createPage()
- */
- public IServerEditorSection createSection() {
- return new ConfigurationMimeEditorSection();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationPortEditorSection.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationPortEditorSection.java
deleted file mode 100644
index 88d1e23..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationPortEditorSection.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.beans.*;
-import java.util.Iterator;
-
-import org.eclipse.wst.server.core.model.IServerPort;
-import org.eclipse.wst.server.core.util.ServerPort;
-import org.eclipse.wst.server.ui.editor.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.internal.command.*;
-import org.eclipse.jst.server.tomcat.ui.internal.ContextIds;
-import org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.help.WorkbenchHelp;
-/**
- * Tomcat configuration port editor page.
- */
-public class ConfigurationPortEditorSection extends ServerResourceEditorSection {
- protected ITomcatConfigurationWorkingCopy tomcatConfiguration;
-
- protected boolean updating;
-
- protected Table ports;
- protected TableViewer viewer;
-
- protected PropertyChangeListener listener;
-
- /**
- * ConfigurationPortEditorSection constructor comment.
- */
- protected ConfigurationPortEditorSection() {
- super();
- }
-
- /**
- *
- */
- protected void addChangeListener() {
- listener = new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if (TomcatConfiguration.MODIFY_PORT_PROPERTY.equals(event.getPropertyName())) {
- String id = (String) event.getOldValue();
- Integer i = (Integer) event.getNewValue();
- changePortNumber(id, i.intValue());
- }
- }
- };
- serverConfiguration.addPropertyChangeListener(listener);
- }
-
- /**
- *
- * @param id java.lang.String
- * @param port int
- */
- protected void changePortNumber(String id, int port) {
- TableItem[] items = ports.getItems();
- int size = items.length;
- for (int i = 0; i < size; i++) {
- IServerPort sp = (IServerPort) items[i].getData();
- if (sp.getId().equals(id)) {
- items[i].setData(new ServerPort(id, sp.getName(), port, sp.getProtocol()));
- items[i].setText(1, port + "");
- /*if (i == selection) {
- selectPort();
- }*/
- return;
- }
- }
- }
-
- /**
- * Creates the SWT controls for this workbench part.
- *
- * @param parent the parent control
- */
- 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(TomcatUIPlugin.getResource("%configurationEditorPortsSection"));
- section.setDescription(TomcatUIPlugin.getResource("%configurationEditorPortsDescription"));
- section.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
-
- // ports
- Composite composite = toolkit.createComposite(section);
- GridLayout layout = new GridLayout();
- layout.marginHeight = 8;
- layout.marginWidth = 8;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL));
- WorkbenchHelp.setHelp(composite, ContextIds.CONFIGURATION_EDITOR_PORTS);
- toolkit.paintBordersFor(composite);
- section.setClient(composite);
-
- ports = toolkit.createTable(composite, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION);
- ports.setHeaderVisible(true);
- ports.setLinesVisible(true);
- WorkbenchHelp.setHelp(ports, ContextIds.CONFIGURATION_EDITOR_PORTS_LIST);
-
- TableLayout tableLayout = new TableLayout();
-
- TableColumn col = new TableColumn(ports, SWT.NONE);
- col.setText(TomcatUIPlugin.getResource("%configurationEditorPortNameColumn"));
- ColumnWeightData colData = new ColumnWeightData(15, 150, true);
- tableLayout.addColumnData(colData);
-
- col = new TableColumn(ports, SWT.NONE);
- col.setText(TomcatUIPlugin.getResource("%configurationEditorPortValueColumn"));
- colData = new ColumnWeightData(8, 80, true);
- tableLayout.addColumnData(colData);
-
- GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
- data.widthHint = 230;
- data.heightHint = 100;
- ports.setLayoutData(data);
- ports.setLayout(tableLayout);
-
- viewer = new TableViewer(ports);
- viewer.setColumnProperties(new String[] {"name", "port"});
-
- initialize();
- }
-
- protected void setupPortEditors() {
- viewer.setCellEditors(new CellEditor[] {null, new TextCellEditor(ports)});
-
- ICellModifier cellModifier = new ICellModifier() {
- public Object getValue(Object element, String property) {
- IServerPort sp = (IServerPort) element;
- return sp.getPort() + "";
- }
-
- public boolean canModify(Object element, String property) {
- if ("port".equals(property))
- return true;
-
- return false;
- }
-
- public void modify(Object element, String property, Object value) {
- try {
- Item item = (Item) element;
- IServerPort sp = (IServerPort) item.getData();
- int port = Integer.parseInt((String) value);
- commandManager.executeCommand(new ModifyPortCommand(tomcatConfiguration, sp.getId(), port));
- } catch (Exception ex) { }
- }
- };
- viewer.setCellModifier(cellModifier);
-
- // preselect second column (Windows-only)
- String os = System.getProperty("os.name");
- if (os != null && os.toLowerCase().indexOf("win") >= 0) {
- ports.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- try {
- int n = ports.getSelectionIndex();
- viewer.editElement(ports.getItem(n).getData(), 1);
- } catch (Exception e) { }
- }
- });
- }
- }
-
- public void dispose() {
- if (serverConfiguration != null)
- serverConfiguration.removePropertyChangeListener(listener);
- }
-
- /* (non-Javadoc)
- * Initializes the editor part with a site and input.
- * <p>
- * Subclasses of <code>EditorPart</code> must implement this method. Within
- * the implementation subclasses should verify that the input type is acceptable
- * and then save the site and input. Here is sample code:
- * </p>
- * <pre>
- * if (!(input instanceof IFileEditorInput))
- * throw new PartInitException("Invalid Input: Must be IFileEditorInput");
- * setSite(site);
- * setInput(editorInput);
- * </pre>
- */
- public void init(IEditorSite site, IEditorInput input) {
- super.init(site, input);
-
- if (serverConfiguration != null) {
- tomcatConfiguration = (ITomcatConfigurationWorkingCopy) serverConfiguration.getWorkingCopyDelegate();
- addChangeListener();
- }
- initialize();
- }
-
- /**
- * Initialize the fields in this editor.
- */
- protected void initialize() {
- if (ports == null)
- return;
-
- ports.removeAll();
-
- Iterator iterator = tomcatConfiguration.getServerPorts().iterator();
- while (iterator.hasNext()) {
- IServerPort port = (IServerPort) iterator.next();
- TableItem item = new TableItem(ports, SWT.NONE);
- String[] s = new String[] {port.getName(), port.getPort() + ""};
- item.setText(s);
- item.setImage(TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_PORT));
- item.setData(port);
- }
-
- if (readOnly) {
- viewer.setCellEditors(new CellEditor[] {null, null});
- viewer.setCellModifier(null);
- } else {
- setupPortEditors();
- }
- }
-
- protected void validate() { }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationPortEditorSectionFactory.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationPortEditorSectionFactory.java
deleted file mode 100644
index d95de26..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationPortEditorSectionFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.ui.editor.*;
-/**
- *
- */
-public class ConfigurationPortEditorSectionFactory implements IServerEditorPageSectionFactoryDelegate {
- /*
- * @see IServerEditorPartFactoryDelegate#shouldDisplay(IServer, IServerConfiguration)
- */
- public boolean shouldCreateSection(IServer server, IServerConfiguration configuration) {
- return (configuration != null);
- }
-
- /*
- * @see IServerEditorPartFactoryDelegate#createPage()
- */
- public IServerEditorSection createSection() {
- return new ConfigurationPortEditorSection();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorFactory.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorFactory.java
deleted file mode 100644
index aed4284..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.ui.editor.IServerEditorPartFactoryDelegate;
-/**
- *
- */
-public class ConfigurationWebModuleEditorFactory implements IServerEditorPartFactoryDelegate {
- /*
- * @see IServerEditorPartFactoryDelegate#shouldDisplay(IServer, IServerConfiguration)
- */
- public boolean shouldCreatePage(IServer server, IServerConfiguration configuration) {
- return (server != null && configuration != null);
- }
-
- /*
- * @see IServerEditorPartFactoryDelegate#createPage()
- */
- public IEditorPart createPage() {
- return new ConfigurationWebModuleEditorPart();
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java
deleted file mode 100644
index c7602ef..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java
+++ /dev/null
@@ -1,376 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.ITomcatServerWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.internal.command.AddWebModuleCommand;
-import org.eclipse.jst.server.tomcat.core.internal.command.ModifyWebModuleCommand;
-import org.eclipse.jst.server.tomcat.core.internal.command.RemoveWebModuleCommand;
-import org.eclipse.jst.server.tomcat.ui.internal.ContextIds;
-import org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.ui.ServerUICore;
-import org.eclipse.wst.server.ui.editor.ICommandManager;
-import org.eclipse.wst.server.ui.editor.ServerResourceEditorPart;
-/**
- * Tomcat configuration web module editor page.
- */
-public class ConfigurationWebModuleEditorPart extends ServerResourceEditorPart {
- protected ITomcatServerWorkingCopy server2;
- protected ITomcatConfigurationWorkingCopy configuration;
-
- protected Table webAppTable;
- protected int selection = -1;
- protected Button addProject;
- protected Button addExtProject;
- protected Button remove;
- protected Button edit;
-
- protected PropertyChangeListener listener;
-
- /**
- * ConfigurationWebModuleEditorPart constructor comment.
- */
- protected ConfigurationWebModuleEditorPart() {
- super();
- }
-
- /**
- *
- */
- protected void addChangeListener() {
- listener = new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if (TomcatConfiguration.MODIFY_WEB_MODULE_PROPERTY.equals(event.getPropertyName())) {
- initialize();
- } else if (TomcatConfiguration.ADD_WEB_MODULE_PROPERTY.equals(event.getPropertyName())) {
- initialize();
- } else if (TomcatConfiguration.REMOVE_WEB_MODULE_PROPERTY.equals(event.getPropertyName())) {
- initialize();
- }
- }
- };
- serverConfiguration.addPropertyChangeListener(listener);
- }
-
- protected ICommandManager getCommandManager() {
- return commandManager;
- }
-
- /**
- * Creates the SWT controls for this workbench part.
- */
- public void createPartControl(Composite parent) {
- FormToolkit toolkit = getFormToolkit(parent.getDisplay());
-
- ScrolledForm form = toolkit.createScrolledForm(parent);
- form.setText(TomcatUIPlugin.getResource("%configurationEditorWebModulesPageTitle"));
- form.getBody().setLayout(new GridLayout());
-
- Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR|Section.DESCRIPTION|ExpandableComposite.FOCUS_TITLE);
- section.setText(TomcatUIPlugin.getResource("%configurationEditorWebModulesSection"));
- section.setDescription(TomcatUIPlugin.getResource("%configurationEditorWebModulesDescription"));
- section.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
-
- Composite composite = toolkit.createComposite(section);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 5;
- layout.marginWidth = 10;
- layout.verticalSpacing = 5;
- layout.horizontalSpacing = 15;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
- WorkbenchHelp.setHelp(composite, ContextIds.CONFIGURATION_EDITOR_WEBMODULES);
- toolkit.paintBordersFor(composite);
- section.setClient(composite);
-
- webAppTable = toolkit.createTable(composite, SWT.V_SCROLL | SWT.SINGLE | SWT.FULL_SELECTION);
- webAppTable.setHeaderVisible(true);
- webAppTable.setLinesVisible(true);
- WorkbenchHelp.setHelp(webAppTable, ContextIds.CONFIGURATION_EDITOR_WEBMODULES_LIST);
- //toolkit.paintBordersFor(webAppTable);
-
- TableLayout tableLayout = new TableLayout();
-
- TableColumn col = new TableColumn(webAppTable, SWT.NONE);
- col.setText(TomcatUIPlugin.getResource("%configurationEditorPathColumn"));
- ColumnWeightData colData = new ColumnWeightData(8, 85, true);
- tableLayout.addColumnData(colData);
-
- TableColumn col2 = new TableColumn(webAppTable, SWT.NONE);
- col2.setText(TomcatUIPlugin.getResource("%configurationEditorDocBaseColumn"));
- colData = new ColumnWeightData(13, 135, true);
- tableLayout.addColumnData(colData);
-
- TableColumn col3 = new TableColumn(webAppTable, SWT.NONE);
- col3.setText(TomcatUIPlugin.getResource("%configurationEditorProjectColumn"));
- colData = new ColumnWeightData(8, 85, true);
- tableLayout.addColumnData(colData);
-
- TableColumn col4 = new TableColumn(webAppTable, SWT.NONE);
- col4.setText(TomcatUIPlugin.getResource("%configurationEditorReloadColumn"));
- colData = new ColumnWeightData(7, 75, true);
- tableLayout.addColumnData(colData);
-
- webAppTable.setLayout(tableLayout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = 450;
- data.heightHint = 120;
- webAppTable.setLayoutData(data);
- webAppTable.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- selectWebApp();
- }
- });
-
- Composite rightPanel = toolkit.createComposite(composite);
- layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- rightPanel.setLayout(layout);
- data = new GridData();
- rightPanel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING));
- //toolkit.paintBordersFor(rightPanel);
-
- // buttons still to add:
- // add project, add external module, remove module
- addProject = toolkit.createButton(rightPanel, TomcatUIPlugin.getResource("%configurationEditorAddProjectModule"), SWT.PUSH);
- data = new GridData(GridData.FILL_HORIZONTAL);
- addProject.setLayoutData(data);
- WorkbenchHelp.setHelp(addProject, ContextIds.CONFIGURATION_EDITOR_WEBMODULES_ADD_PROJECT);
-
- // disable the add project module button if there are no
- // web projects in the workbench
- if (!canAddWebModule())
- addProject.setEnabled(false);
- else {
- addProject.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- WebModuleDialog dialog = new WebModuleDialog(getEditorSite().getShell(), server2, configuration, true);
- dialog.open();
- if (dialog.getReturnCode() == IDialogConstants.OK_ID) {
- getCommandManager().executeCommand(new AddWebModuleCommand(configuration, dialog.getWebModule()));
- }
- }
- });
- }
-
- addExtProject = toolkit.createButton(rightPanel, TomcatUIPlugin.getResource("%configurationEditorAddExternalModule"), SWT.PUSH);
- data = new GridData(GridData.FILL_HORIZONTAL);
- addExtProject.setLayoutData(data);
- addExtProject.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- WebModuleDialog dialog = new WebModuleDialog(getEditorSite().getShell(), server2, configuration, false);
- dialog.open();
- if (dialog.getReturnCode() == IDialogConstants.OK_ID) {
- getCommandManager().executeCommand(new AddWebModuleCommand(configuration, dialog.getWebModule()));
- }
- }
- });
- WorkbenchHelp.setHelp(addExtProject, ContextIds.CONFIGURATION_EDITOR_WEBMODULES_ADD_EXTERNAL);
-
- edit = toolkit.createButton(rightPanel, TomcatUIPlugin.getResource("%editorEdit"), SWT.PUSH);
- data = new GridData(GridData.FILL_HORIZONTAL);
- edit.setLayoutData(data);
- edit.setEnabled(false);
- edit.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (selection < 0)
- return;
- WebModule module = (WebModule) configuration.getWebModules().get(selection);
- WebModuleDialog dialog = new WebModuleDialog(getEditorSite().getShell(), server2, configuration, module);
- dialog.open();
- if (dialog.getReturnCode() == IDialogConstants.OK_ID) {
- getCommandManager().executeCommand(new ModifyWebModuleCommand(configuration, selection, dialog.getWebModule()));
- }
- }
- });
- WorkbenchHelp.setHelp(edit, ContextIds.CONFIGURATION_EDITOR_WEBMODULES_EDIT);
-
- remove = toolkit.createButton(rightPanel, TomcatUIPlugin.getResource("%editorRemove"), SWT.PUSH);
- data = new GridData(GridData.FILL_HORIZONTAL);
- remove.setLayoutData(data);
- remove.setEnabled(false);
- remove.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (selection < 0)
- return;
- getCommandManager().executeCommand(new RemoveWebModuleCommand(configuration, selection));
- remove.setEnabled(false);
- edit.setEnabled(false);
- selection = -1;
- }
- });
- WorkbenchHelp.setHelp(remove, ContextIds.CONFIGURATION_EDITOR_WEBMODULES_REMOVE);
-
- initialize();
- }
-
- protected boolean canAddWebModule() {
- Iterator iterator = ServerUtil.getModules("j2ee.web", "*", false).iterator();
- while (iterator.hasNext()) {
- Object module = iterator.next();
- if (module instanceof IWebModule) {
- IStatus status = server.canModifyModules(new IModule[] { (IWebModule) module }, null);
- if (status != null && status.isOK())
- return true;
- }
- }
- return false;
- }
-
- public void dispose() {
- if (serverConfiguration != null)
- serverConfiguration.removePropertyChangeListener(listener);
- }
-
- /* (non-Javadoc)
- * Initializes the editor part with a site and input.
- * <p>
- * Subclasses of <code>EditorPart</code> must implement this method. Within
- * the implementation subclasses should verify that the input type is acceptable
- * and then save the site and input. Here is sample code:
- * </p>
- * <pre>
- * if (!(input instanceof IFileEditorInput))
- * throw new PartInitException("Invalid Input: Must be IFileEditorInput");
- * setSite(site);
- * setInput(editorInput);
- * </pre>
- */
- public void init(IEditorSite site, IEditorInput input) {
- super.init(site, input);
-
- if (serverConfiguration != null) {
- configuration = (ITomcatConfigurationWorkingCopy) serverConfiguration.getWorkingCopyDelegate();
- addChangeListener();
- }
-
- if (server != null) {
- server2 = (ITomcatServerWorkingCopy) server.getWorkingCopyDelegate();
- }
- initialize();
- }
-
- /**
- *
- */
- protected void initialize() {
- if (webAppTable == null)
- return;
-
- webAppTable.removeAll();
-
- List list = configuration.getWebModules();
- Iterator iterator = list.iterator();
- while (iterator.hasNext()) {
- WebModule module = (WebModule) iterator.next();
- TableItem item = new TableItem(webAppTable, SWT.NONE);
-
- // FIX-ME
- String memento = module.getMemento();
- String projectName = "";
- Image projectImage = null;
- if (memento != null && memento.length() > 0) {
- projectName = TomcatUIPlugin.getResource("%configurationEditorProjectMissing", new String[] {memento});
- projectImage = TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_PROJECT_MISSING);
- int index = memento.indexOf(":");
- if (index > 0) {
- String factoryId = memento.substring(0, index);
- String mem = memento.substring(index + 1);
- projectName = TomcatUIPlugin.getResource("%configurationEditorProjectMissing", new String[] {mem});
- IModule module2 = ServerUtil.getModule(factoryId, mem);
- if (module != null) {
- projectName = ServerUICore.getLabelProvider().getText(module2);
- projectImage = ServerUICore.getLabelProvider().getImage(module2);
- }
- }
- }
-
- String reload = module.isReloadable() ? TomcatUIPlugin.getResource("%configurationEditorReloadEnabled") : TomcatUIPlugin.getResource("%configurationEditorReloadDisabled");
- String[] s = new String[] {module.getPath(), module.getDocumentBase(), projectName, reload};
- item.setText(s);
- item.setImage(0, TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_WEB_MODULE));
- if (projectImage != null)
- item.setImage(2, projectImage);
- }
-
- if (readOnly) {
- addProject.setEnabled(false);
- addExtProject.setEnabled(false);
- edit.setEnabled(false);
- remove.setEnabled(false);
- } else {
- addProject.setEnabled(canAddWebModule());
- addExtProject.setEnabled(true);
- }
- }
-
- /**
- *
- */
- protected void selectWebApp() {
- if (readOnly)
- return;
-
- try {
- selection = webAppTable.getSelectionIndex();
- remove.setEnabled(true);
- edit.setEnabled(true);
- } catch (Exception e) {
- selection = -1;
- remove.setEnabled(false);
- edit.setEnabled(false);
- }
- }
-
- /**
- * @see IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- if (webAppTable != null)
- webAppTable.setFocus();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/MimeMappingDialog.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/MimeMappingDialog.java
deleted file mode 100644
index 0725b8b..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/MimeMappingDialog.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.server.tomcat.core.internal.MimeMapping;
-import org.eclipse.jst.server.tomcat.ui.internal.ContextIds;
-import org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Dialog to add or modify mime mappings.
- */
-public class MimeMappingDialog extends Dialog {
- protected MimeMapping map;
- protected boolean isEdit;
-
- /**
- * MimeMappingDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- protected MimeMappingDialog(Shell parentShell) {
- this(parentShell, new MimeMapping("", ""));
- isEdit = false;
- }
-
- /**
- * SystemPropertyDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- protected MimeMappingDialog(Shell parentShell, MimeMapping map) {
- super(parentShell);
- this.map = map;
- isEdit = true;
- }
-
- /**
- *
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setImage(TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_MIME_MAPPING));
- if (isEdit)
- newShell.setText(TomcatUIPlugin.getResource("%configurationEditorMimeMapppingDialogTitleEdit"));
- else
- newShell.setText(TomcatUIPlugin.getResource("%configurationEditorMimeMapppingDialogTitleAdd"));
- }
-
- /**
- * Creates and returns the contents of the upper part
- * of this dialog (above the button bar).
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * creates and returns a new <code>Composite</code> with
- * standard margins and spacing. Subclasses should override.
- * </p>
- *
- * @param the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- WorkbenchHelp.setHelp(composite, ContextIds.CONFIGURATION_EDITOR_MAPPING_DIALOG);
-
- new Label(composite, SWT.NONE).setText(TomcatUIPlugin.getResource("%configurationEditorMimeMapppingDialogMimeType"));
- final Text type = new Text(composite, SWT.BORDER);
- GridData data = new GridData();
- data.widthHint = 150;
- type.setLayoutData(data);
- type.setText(map.getMimeType());
- type.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- map = new MimeMapping(map.getExtension(), type.getText());
- validate();
- }
- });
- WorkbenchHelp.setHelp(type, ContextIds.CONFIGURATION_EDITOR_MAPPING_DIALOG_TYPE);
-
- new Label(composite, SWT.NONE).setText(TomcatUIPlugin.getResource("%configurationEditorMimeMapppingDialogMimeExtension"));
- final Text extension = new Text(composite, SWT.BORDER);
- data = new GridData();
- data.widthHint = 150;
- extension.setLayoutData(data);
- extension.setText(map.getExtension());
- extension.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- map = new MimeMapping(extension.getText(), map.getMimeType());
- validate();
- }
- });
- WorkbenchHelp.setHelp(extension, ContextIds.CONFIGURATION_EDITOR_MAPPING_DIALOG_EXTENSION);
-
- Dialog.applyDialogFont(composite);
-
- return composite;
- }
-
- protected Control createButtonBar(Composite parent) {
- Control control = super.createButtonBar(parent);
- validate();
-
- return control;
- }
-
- protected void validate() {
- boolean ok = true;
- if (map.getExtension() == null || map.getExtension().length() < 1)
- ok = false;
- if (map.getMimeType() == null || map.getMimeType().length() < 1)
- ok = false;
- getButton(IDialogConstants.OK_ID).setEnabled(ok);
- }
-
- /**
- * Return the mime mapping.
- *
- * @return org.eclipse.jst.server.tomcat.MimeMapping
- */
- public MimeMapping getMimeMapping() {
- return map;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ServerGeneralEditorSection.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ServerGeneralEditorSection.java
deleted file mode 100644
index 693c52a..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ServerGeneralEditorSection.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.jst.server.tomcat.core.ITomcatServer;
-import org.eclipse.jst.server.tomcat.core.ITomcatServerWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.command.SetDebugModeCommand;
-import org.eclipse.jst.server.tomcat.core.internal.command.SetSecureCommand;
-import org.eclipse.jst.server.tomcat.core.internal.command.SetTestEnvironmentCommand;
-import org.eclipse.jst.server.tomcat.ui.internal.ContextIds;
-import org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.wst.server.ui.editor.*;
-/**
- * Tomcat server general editor page.
- */
-public class ServerGeneralEditorSection extends ServerResourceEditorSection {
- protected ITomcatServerWorkingCopy tomcatServer;
-
- protected Button secure;
- protected Button debug;
- protected Button testEnvironment;
- protected boolean updating;
-
- protected PropertyChangeListener listener;
-
- /**
- * ServerGeneralEditorPart constructor comment.
- */
- protected ServerGeneralEditorSection() { }
-
- /**
- *
- */
- protected void addChangeListener() {
- listener = new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if (updating)
- return;
- updating = true;
- if (ITomcatServer.PROPERTY_SECURE.equals(event.getPropertyName())) {
- Boolean b = (Boolean) event.getNewValue();
- ServerGeneralEditorSection.this.secure.setSelection(b.booleanValue());
- } else if (ITomcatServer.PROPERTY_DEBUG.equals(event.getPropertyName())) {
- Boolean b = (Boolean) event.getNewValue();
- ServerGeneralEditorSection.this.debug.setSelection(b.booleanValue());
- } else if (ITomcatServer.PROPERTY_TEST_ENVIRONMENT.equals(event.getPropertyName())) {
- Boolean b = (Boolean) event.getNewValue();
- ServerGeneralEditorSection.this.testEnvironment.setSelection(b.booleanValue());
- }
- updating = false;
- }
- };
- server.addPropertyChangeListener(listener);
- }
-
- /**
- * Creates the SWT controls for this workbench part.
- *
- * @param parent the parent control
- */
- 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(TomcatUIPlugin.getResource("%serverEditorGeneralSection"));
- section.setDescription(TomcatUIPlugin.getResource("%serverEditorGeneralDescription"));
- section.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
-
- Composite composite = toolkit.createComposite(section);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.marginHeight = 5;
- layout.marginWidth = 10;
- layout.verticalSpacing = 5;
- layout.horizontalSpacing = 15;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
- WorkbenchHelp.setHelp(composite, ContextIds.SERVER_EDITOR);
- toolkit.paintBordersFor(composite);
- section.setClient(composite);
-
- // test environment
- testEnvironment = toolkit.createButton(composite, TomcatUIPlugin.getResource("%serverEditorTestEnvironment"), SWT.CHECK);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 3;
- testEnvironment.setLayoutData(data);
- testEnvironment.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent se) {
- if (updating)
- return;
- updating = true;
- commandManager.executeCommand(new SetTestEnvironmentCommand(tomcatServer, testEnvironment.getSelection()));
- updating = false;
- }
- });
- WorkbenchHelp.setHelp(testEnvironment, ContextIds.SERVER_EDITOR_TEST_ENVIRONMENT);
-
- // security
- secure = toolkit.createButton(composite, TomcatUIPlugin.getResource("%serverEditorSecure"), SWT.CHECK);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 3;
- secure.setLayoutData(data);
- secure.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent se) {
- if (updating)
- return;
- updating = true;
- commandManager.executeCommand(new SetSecureCommand(tomcatServer, secure.getSelection()));
- updating = false;
- }
- });
- WorkbenchHelp.setHelp(secure, ContextIds.SERVER_EDITOR_SECURE);
-
- // debug mode
- debug = toolkit.createButton(composite, TomcatUIPlugin.getResource("%serverEditorDebugMode"), SWT.CHECK);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 3;
- debug.setLayoutData(data);
- debug.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent se) {
- if (updating)
- return;
- updating = true;
- commandManager.executeCommand(new SetDebugModeCommand(tomcatServer, debug.getSelection()));
- updating = false;
- }
- });
- WorkbenchHelp.setHelp(debug, ContextIds.SERVER_EDITOR_DEBUG_MODE);
-
- initialize();
- }
-
- public void dispose() {
- if (server != null)
- server.removePropertyChangeListener(listener);
- }
-
- public void init(IEditorSite site, IEditorInput input) {
- super.init(site, input);
-
- if (server != null) {
- tomcatServer = (ITomcatServerWorkingCopy) server.getWorkingCopyDelegate();
- addChangeListener();
- }
- initialize();
- }
-
- /**
- * Initialize the fields in this editor.
- */
- protected void initialize() {
- if (secure == null || tomcatServer == null)
- return;
- updating = true;
-
- testEnvironment.setSelection(tomcatServer.isTestEnvironment());
- secure.setSelection(tomcatServer.isSecure());
- if (server.getRuntime() != null && server.getRuntime().getRuntimeType().getId().indexOf("32") >= 0 || readOnly)
- debug.setEnabled(false);
- else {
- debug.setEnabled(true);
- debug.setSelection(tomcatServer.isDebug());
- }
-
- if (readOnly)
- secure.setEnabled(false);
- else
- secure.setEnabled(true);
-
- updating = false;
- }
-
- protected void validate() { }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ServerGeneralEditorSectionFactory.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ServerGeneralEditorSectionFactory.java
deleted file mode 100644
index fb2c7f4..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ServerGeneralEditorSectionFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerConfiguration;
-import org.eclipse.wst.server.ui.editor.*;
-/**
- *
- */
-public class ServerGeneralEditorSectionFactory implements IServerEditorPageSectionFactoryDelegate {
- /*
- * @see IServerEditorPartFactoryDelegate#shouldDisplay(IServer, IServerConfiguration)
- */
- public boolean shouldCreateSection(IServer server, IServerConfiguration configuration) {
- return (server != null && server.getServerType().getId().indexOf("tomcat") >= 0);
- }
-
- /*
- * @see IServerEditorPartFactoryDelegate#createPage()
- */
- public IServerEditorSection createSection() {
- return new ServerGeneralEditorSection();
- }
-}
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java
deleted file mode 100644
index 2c03fae..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.eclipse.jst.server.tomcat.ui.internal.editor;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.server.j2ee.IWebModule;
-import org.eclipse.jst.server.tomcat.core.ITomcatConfiguration;
-import org.eclipse.jst.server.tomcat.core.ITomcatServer;
-import org.eclipse.jst.server.tomcat.core.WebModule;
-import org.eclipse.jst.server.tomcat.ui.internal.ContextIds;
-import org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin;
-import org.eclipse.jst.server.tomcat.ui.internal.Trace;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IModule;
-import org.eclipse.wst.server.ui.ServerUICore;
-/**
- * Dialog to add or modify web modules.
- */
-public class WebModuleDialog extends Dialog {
- protected WebModule module;
- protected boolean isEdit;
- protected boolean isProject;
- protected Text docBase;
- protected ITomcatServer server;
- protected ITomcatConfiguration config;
-
- protected Table projTable;
-
- /**
- * WebModuleDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- protected WebModuleDialog(Shell parentShell, ITomcatServer server, ITomcatConfiguration config, WebModule module) {
- super(parentShell);
- this.module = module;
- this.server = server;
- this.config = config;
- isEdit = true;
- }
-
- /**
- * WebModuleDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- protected WebModuleDialog(Shell parentShell, ITomcatServer server, ITomcatConfiguration config, boolean isProject) {
- this(parentShell, server, config, new WebModule("/", "", null, true));
- isEdit = false;
- this.isProject = isProject;
- }
-
- /**
- *
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isEdit)
- newShell.setText(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogTitleEdit"));
- else
- newShell.setText(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogTitleAdd"));
- }
-
- /**
- * Creates and returns the contents of the upper part
- * of this dialog (above the button bar).
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * creates and returns a new <code>Composite</code> with
- * standard margins and spacing. Subclasses should override.
- * </p>
- *
- * @param the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- WorkbenchHelp.setHelp(composite, ContextIds.CONFIGURATION_EDITOR_WEBMODULE_DIALOG);
- // add project field if we are adding a project
- if (!isEdit && isProject) {
- Label l = new Label(composite, SWT.NONE);
- l.setText(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogProjects"));
- GridData data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
- l.setLayoutData(data);
-
- projTable = new Table(composite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE);
- data = new GridData();
- data.widthHint = 150;
- data.heightHint = 75;
- projTable.setLayoutData(data);
- WorkbenchHelp.setHelp(projTable, ContextIds.CONFIGURATION_EDITOR_WEBMODULE_DIALOG_PROJECT);
-
- // fill table with web module projects
- Iterator iterator = ServerUtil.getModules("j2ee.web", "*", false).iterator();
- while (iterator.hasNext()) {
- Object module3 = iterator.next();
- if (module3 instanceof IWebModule) {
- IWebModule module2 = (IWebModule) module3;
- IStatus status = server.canModifyModules(new IModule[] { module2}, null);
- if (status != null && status.isOK()) {
- TableItem item = new TableItem(projTable, SWT.NONE);
- item.setText(0, ServerUICore.getLabelProvider().getText(module2));
- item.setImage(0, ServerUICore.getLabelProvider().getImage(module2));
- item.setData(module2);
- }
- }
- }
- new Label(composite, SWT.NONE).setText(" ");
- }
-
- new Label(composite, SWT.NONE).setText(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogDocumentBase"));
- docBase = new Text(composite, SWT.BORDER);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- docBase.setLayoutData(data);
- docBase.setText(module.getDocumentBase());
- WorkbenchHelp.setHelp(docBase, ContextIds.CONFIGURATION_EDITOR_WEBMODULE_DIALOG_DOCBASE);
-
- // disable document base for project modules
- if (isProject || (module.getMemento() != null && module.getMemento().length() > 0))
- docBase.setEnabled(false);
- else {
- docBase.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- module = new WebModule(module.getPath(), docBase.getText(), module.getMemento(), module.isReloadable());
- validate();
- }
- });
- }
-
- if (isEdit || isProject)
- new Label(composite, SWT.NONE).setText(" ");
- else {
- Button browse = new Button(composite, SWT.NONE);
- browse.setText(TomcatUIPlugin.getResource("%browse"));
- browse.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent se) {
- try {
- DirectoryDialog dialog = new DirectoryDialog(getShell());
- dialog.setMessage(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogSelectDirectory"));
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- docBase.setText(selectedDirectory);
- } catch (Exception e) {
- Trace.trace("Error browsing", e);
- }
- }
- });
- }
-
- // path (context-root)
- new Label(composite, SWT.NONE).setText(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogPath"));
- final Text path = new Text(composite, SWT.BORDER);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = 150;
- path.setLayoutData(data);
- path.setText(module.getPath());
- path.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- module = new WebModule(path.getText(), module.getDocumentBase(), module.getMemento(), module.isReloadable());
- }
- });
- WorkbenchHelp.setHelp(path, ContextIds.CONFIGURATION_EDITOR_WEBMODULE_DIALOG_PATH);
-
- new Label(composite, SWT.NONE).setText("");
-
- // auto reload
- new Label(composite, SWT.NONE).setText(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogAutoReload"));
- final Button reloadable = new Button(composite, SWT.CHECK);
- reloadable.setText(TomcatUIPlugin.getResource("%configurationEditorWebModuleDialogReloadEnabled"));
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- reloadable.setLayoutData(data);
- reloadable.setSelection(module.isReloadable());
- reloadable.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- module = new WebModule(module.getPath(), module.getDocumentBase(), module.getMemento(), reloadable.getSelection());
- }
- });
- WorkbenchHelp.setHelp(reloadable, ContextIds.CONFIGURATION_EDITOR_WEBMODULE_DIALOG_RELOAD);
-
- if (!isEdit && isProject) {
- projTable.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- try {
- IWebModule module2 = (IWebModule) projTable.getSelection()[0].getData();
- String contextRoot = module2.getContextRoot();
- if (contextRoot != null && !contextRoot.startsWith("/"))
- contextRoot = "/" + contextRoot;
- module = new WebModule(contextRoot, module2.getLocation().toOSString(), module2.getFactoryId() + ":" + module2.getId(), module.isReloadable());
- docBase.setText(module2.getLocation().toOSString());
- } catch (Exception e) { }
- validate();
- }
- });
- new Label(composite, SWT.NONE).setText("");
- }
-
- Dialog.applyDialogFont(composite);
- return composite;
- }
-
- protected Control createButtonBar(Composite parent) {
- Control control = super.createButtonBar(parent);
- validate();
-
- return control;
- }
-
- protected void validate() {
- boolean ok = true;
- if (module.getDocumentBase() == null || module.getDocumentBase().length() < 1)
- ok = false;
-
- getButton(IDialogConstants.OK_ID).setEnabled(ok);
- }
-
- /**
- * Return the mime mapping.
- *
- * @return org.eclipse.jst.server.tomcat.WebModule
- */
- public WebModule getWebModule() {
- return module;
- }
-}
diff --git a/plugins/org.eclipse.jst.server.ui/.classpath b/plugins/org.eclipse.jst.server.ui/.classpath
deleted file mode 100644
index 6f75060..0000000
--- a/plugins/org.eclipse.jst.server.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sjavaui/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.server.ui/.cvsignore b/plugins/org.eclipse.jst.server.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jst.server.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jst.server.ui/.project b/plugins/org.eclipse.jst.server.ui/.project
deleted file mode 100644
index 34eb7e0..0000000
--- a/plugins/org.eclipse.jst.server.ui/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.server.core</project>
- <project>org.eclipse.jst.server.core</project>
- <project>org.eclipse.wst.server.ui</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.server.ui/build.properties b/plugins/org.eclipse.jst.server.ui/build.properties
deleted file mode 100644
index d0e25d5..0000000
--- a/plugins/org.eclipse.jst.server.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- *.jar,\
- plugin.properties,\
- icons/,\
- sjavaui.jar
-jars.compile.order =
-src.includes = schema/,\
- build.properties
-output.sjavaui.jar = bin/
-source.sjavaui.jar = sjavaui/
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/appclient_module.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/appclient_module.gif
deleted file mode 100644
index 4423578..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/obj16/appclient_module.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/ear.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/ear.gif
deleted file mode 100644
index b5630b3..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/obj16/ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/ejb_module.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/ejb_module.gif
deleted file mode 100644
index f8b5c0a..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/obj16/ejb_module.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/java_jar.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/java_jar.gif
deleted file mode 100644
index 6059f86..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/obj16/java_jar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/java_system_property.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/java_system_property.gif
deleted file mode 100644
index bc51b5e..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/obj16/java_system_property.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/java_var.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/java_var.gif
deleted file mode 100644
index ff42a74..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/obj16/java_var.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/web_module.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/web_module.gif
deleted file mode 100644
index bf20f70..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/obj16/web_module.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/icons/wizban/new_runtime_wiz.gif b/plugins/org.eclipse.jst.server.ui/icons/wizban/new_runtime_wiz.gif
deleted file mode 100644
index 30de91f..0000000
--- a/plugins/org.eclipse.jst.server.ui/icons/wizban/new_runtime_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.properties b/plugins/org.eclipse.jst.server.ui/plugin.properties
deleted file mode 100644
index 044ec1c..0000000
--- a/plugins/org.eclipse.jst.server.ui/plugin.properties
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Java Server UI Support
-providerName=IBM
-
-# --------------- Java UI ---------------
-
-javaSystemPropertiesTitle=System Properties
-javaSystemPropertiesDescription=Enter system properties (-D options) to be passed to the server.
-
-javaClasspathTitle=Class Path
-javaClasspathDescription=Change class path entries.
-
-javaPathTitle=Java Library Path
-javaPathDescription=Enter Java Library Path and choose one of the Path Options.
-javaPathValue=Java Library Path
-
-javaVMArgumentsTitle=Java VM Arguments
-javaVMArgumentsDescription=Enter arguments to the Java VM.
-
-javaAdd=Add...
-javaRemove=Remove
-javaEdit=Edit...
-javaDown=Down
-javaUp=Up
-javaBrowse=&Browse...
-
-javaSystemProperties=System Properties:
-javaSystemPropertyNameColumn=Name
-javaSystemPropertyValueColumn=Value
-javaSystemPropertyAddDialog=Add System Property
-javaSystemPropertyEditDialog=Edit System Property
-javaSystemPropertyName=&Name:
-javaSystemPropertyValue=&Value:
-
-javaClasspath=Class Path:
-javaAddExternalJar=Add External JARs...
-javaAddExternalJarDialog=Select JAR file
-javaAddExternalFolder=Add External Folder...
-javaAddExternalFolderDialog=Select Folder
-javaAddExternalFolderDialogMessage=Select a folder to add to the class path.
-javaAddFolder=Add Folder...
-javaAddFolderDialogTitle=Select Folder
-javaAddFolderDialogMessage=Select a folder to add to the class path.
-javaAddVariable=Add Variable...
-javaAddVariableDialogTitle=Add Class Path Variable
-javaAddVariableDialogName=&Variable Name:
-javaAddVariableDialogExtension=&Path Extension:
-javaAddVariableDialogResolved=Resolved Path:
-javaAddString=Add Path...
-javaAddStringDialogTitle=Add Class Path
-javaAddStringDialogPath=Path:
-javaAddStringDialogInvalidPath=The path must be absolute.
-javaEditStringDialogTitle=Edit Class Path
-
-javaPath=System Path:
-javaPathGroup=Path Option
-javaPathAppend=Append to system path
-javaPathPrepend=Prepend to system path
-javaPathReplace=Replace system path
-
-javaVMArguments=Java VM Arguments:
-
-runtimeTypeTitle=Generic J2EE Runtime
-runtimeTypeDescription=Define a generic J2EE runtime. Specify a directory containing jar files to compile against.
-runtimeTypeName=Na&me:
-runtimeTypeLocation=&Location:
-browse=B&rowse...
-runtimeTypeSelectLocation=Select the location of the runtime.
-runtimeTypeJRE=&JRE:
-runtimeTypeInstalledJREs=In&stalled JREs...
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.xml b/plugins/org.eclipse.jst.server.ui/plugin.xml
deleted file mode 100644
index 6ee0308..0000000
--- a/plugins/org.eclipse.jst.server.ui/plugin.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin id="org.eclipse.jst.server.ui"
- name="%pluginName"
- version="3.0.0"
- provider-name="%providerName"
- class="org.eclipse.jst.server.internal.ui.JavaServerUIPlugin">
-
-<requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.wst.server.ui"/>
- <import plugin="org.eclipse.jst.server.core"/>
-</requires>
-
- <runtime>
- <library name="sjavaui.jar">
- <export name="*"/>
- <packages prefixes="org.eclipse.jst.server.ui"/>
- </library>
- </runtime>
-
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- id="org.eclipse.jst.server"
- typeIds="org.eclipse.jst.server.core.runtimeType"
- icon="icons/obj16/java_jar.gif"/>
- <image
- id="org.eclipse.jst.server"
- typeIds="j2ee.web"
- icon="icons/obj16/web_module.gif"/>
- <image
- id="org.eclipse.jst.server"
- typeIds="j2ee.ejb"
- icon="icons/obj16/ejb_module.gif"/>
- <image
- id="org.eclipse.jst.server"
- typeIds="j2ee.ear"
- icon="icons/obj16/ear.gif"/>
- <image
- id="org.eclipse.jst.server"
- typeIds="j2ee.appclient"
- icon="icons/obj16/appclient_module.gif"/>
- <image
- id="org.eclipse.jst.server"
- typeIds="j2ee.connector"
- icon="icons/obj16/java_jar.gif"/>
- <image
- id="org.eclipse.jst.server"
- typeIds="j2ee.loosearchive"
- icon="icons/obj16/java_jar.gif"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.ui.wizardFragments">
- <fragment
- id="org.eclipse.jst.server.core.runtimeType"
- typeIds="org.eclipse.jst.server.core.runtimeType"
- class="org.eclipse.jst.server.internal.ui.GenericRuntimeWizardFragment"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/ContextIds.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/ContextIds.java
deleted file mode 100644
index 912c27f..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/ContextIds.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jst.server.internal.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * Context help id constants.
- */
-public interface ContextIds {
- public static final String JAVA_CLASSPATH = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0000";
- public static final String JAVA_CLASSPATH_TABLE = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0002";
- public static final String JAVA_CLASSPATH_UP = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0004";
- public static final String JAVA_CLASSPATH_DOWN = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0006";
- public static final String JAVA_CLASSPATH_ADD_EXTERNAL_JAR = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0008";
- public static final String JAVA_CLASSPATH_ADD_EXTERNAL_FOLDER = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0009";
- public static final String JAVA_CLASSPATH_ADD_VARIABLE = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0011";
- public static final String JAVA_CLASSPATH_ADD_STRING = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0013";
- public static final String JAVA_CLASSPATH_EDIT = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0015";
- public static final String JAVA_CLASSPATH_REMOVE = JavaServerUIPlugin.PLUGIN_ID + ".jvcp0012";
-
- public static final String JAVA_PATH = JavaServerUIPlugin.PLUGIN_ID + ".jvpt0000";
- public static final String JAVA_PATH_FIELD = JavaServerUIPlugin.PLUGIN_ID + ".jvpt0002";
- public static final String JAVA_PATH_APPEND = JavaServerUIPlugin.PLUGIN_ID + ".jvpt0004";
- public static final String JAVA_PATH_PREPEND = JavaServerUIPlugin.PLUGIN_ID + ".jvpt0006";
- public static final String JAVA_PATH_REPLACE = JavaServerUIPlugin.PLUGIN_ID + ".jvpt0008";
-
- public static final String JAVA_SYSTEM_PROPERTY = JavaServerUIPlugin.PLUGIN_ID + ".jvsp0000";
- public static final String JAVA_SYSTEM_PROPERTY_TABLE = JavaServerUIPlugin.PLUGIN_ID + ".jvsp0002";
- public static final String JAVA_SYSTEM_PROPERTY_ADD = JavaServerUIPlugin.PLUGIN_ID + ".jvsp0004";
- public static final String JAVA_SYSTEM_PROPERTY_EDIT = JavaServerUIPlugin.PLUGIN_ID + ".jvsp0006";
- public static final String JAVA_SYSTEM_PROPERTY_REMOVE = JavaServerUIPlugin.PLUGIN_ID + ".jvsp0008";
-
- public static final String JAVA_SYSTEM_PROPERTY_DIALOG = JavaServerUIPlugin.PLUGIN_ID + ".jvpd0000";
- public static final String JAVA_SYSTEM_PROPERTY_DIALOG_NAME = JavaServerUIPlugin.PLUGIN_ID + ".jvpd0002";
- public static final String JAVA_SYSTEM_PROPERTY_DIALOG_VALUE = JavaServerUIPlugin.PLUGIN_ID + ".jvpd0004";
-
- public static final String JAVA_CLASSPATH_VARIABLE_DIALOG = JavaServerUIPlugin.PLUGIN_ID + ".jvvd0000";
- public static final String JAVA_CLASSPATH_VARIABLE_DIALOG_VARIABLE = JavaServerUIPlugin.PLUGIN_ID + ".jvvd0002";
- public static final String JAVA_CLASSPATH_VARIABLE_DIALOG_EXTENSION = JavaServerUIPlugin.PLUGIN_ID + ".jvvd0004";
- public static final String JAVA_CLASSPATH_VARIABLE_DIALOG_EXTENSION_BROWSE = JavaServerUIPlugin.PLUGIN_ID + ".jvvd0006";
-
- public static final String JAVA_CLASSPATH_STRING_DIALOG = JavaServerUIPlugin.PLUGIN_ID + ".jvsd0000";
- public static final String JAVA_CLASSPATH_STRING_DIALOG_PATH = JavaServerUIPlugin.PLUGIN_ID + ".jvsd0002";
-
- public static final String JAVA_VM_ARGUMENTS = JavaServerUIPlugin.PLUGIN_ID + ".jvvm0000";
-
- public static final String RUNTIME_TARGET_COMPOSITE = JavaServerUIPlugin.PLUGIN_ID + ".jvrt0000";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/GenericRuntimeComposite.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/GenericRuntimeComposite.java
deleted file mode 100644
index 9b664c6..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/GenericRuntimeComposite.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.eclipse.jst.server.internal.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.*;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.server.core.IGenericRuntimeWorkingCopy;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.WorkbenchHelp;
-/**
- * Wizard page to set the server install directory.
- */
-public class GenericRuntimeComposite extends Composite {
- protected static final String INSTALLED_JRE_PREFERENCE_PAGE_ID = "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage";
- protected IRuntimeWorkingCopy runtimeWC;
- protected IGenericRuntimeWorkingCopy runtime;
-
- protected IWizardHandle wizard;
-
- protected Text name;
- protected Text installDir;
- protected Combo combo;
- protected List installedJREs;
- protected String[] jreNames;
- protected int defaultVMIndex;
-
- /**
- * GenericRuntimeComposite constructor comment.
- */
- protected GenericRuntimeComposite(Composite parent, IWizardHandle wizard) {
- super(parent, SWT.NONE);
- this.wizard = wizard;
-
- wizard.setTitle(JavaServerUIPlugin.getResource("%runtimeTypeTitle"));
- wizard.setDescription(JavaServerUIPlugin.getResource("%runtimeTypeDescription"));
- wizard.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_RUNTIME_TYPE));
-
- createControl();
- }
-
- protected void setRuntime(IRuntimeWorkingCopy newRuntime) {
- if (newRuntime == null) {
- runtimeWC = null;
- runtime = null;
- } else {
- runtimeWC = newRuntime;
- runtime = (IGenericRuntimeWorkingCopy) newRuntime.getWorkingCopyDelegate();
- }
-
- init();
- validate();
- }
-
- /**
- * Provide a wizard page to change the Tomcat installation directory.
- *
- * @param parent the parent composite
- * @return the new control
- */
- protected void createControl() {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- setLayout(layout);
- setLayoutData(new GridData(GridData.FILL_BOTH));
- WorkbenchHelp.setHelp(this, ContextIds.RUNTIME_TARGET_COMPOSITE);
-
- Label label = new Label(this, SWT.NONE);
- label.setText(JavaServerUIPlugin.getResource("%runtimeTypeName"));
- GridData data = new GridData();
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- name = new Text(this, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- name.setLayoutData(data);
- name.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- runtimeWC.setName(name.getText());
- validate();
- }
- });
-
- label = new Label(this, SWT.NONE);
- label.setText(JavaServerUIPlugin.getResource("%runtimeTypeLocation"));
- data = new GridData();
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- installDir = new Text(this, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- installDir.setLayoutData(data);
- installDir.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- runtimeWC.setLocation(new Path(installDir.getText()));
- validate();
- }
- });
-
- Button browse = SWTUtil.createButton(this, JavaServerUIPlugin.getResource("%browse"));
- browse.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent se) {
- DirectoryDialog dialog = new DirectoryDialog(GenericRuntimeComposite.this.getShell());
- dialog.setMessage(JavaServerUIPlugin.getResource("%runtimeTypeSelectLocation"));
- dialog.setFilterPath(installDir.getText());
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- installDir.setText(selectedDirectory);
- }
- });
-
- updateJREs();
-
- // JDK location
- label = new Label(this, SWT.NONE);
- label.setText(JavaServerUIPlugin.getResource("%runtimeTypeJRE"));
- data = new GridData();
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- combo = new Combo(this, SWT.DROP_DOWN | SWT.READ_ONLY);
- combo.setItems(jreNames);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- combo.setLayoutData(data);
-
- combo.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- int sel = combo.getSelectionIndex();
- IVMInstall vmInstall = (IVMInstall) installedJREs.get(sel);
- runtime.setVMInstall(vmInstall.getVMInstallType().getId(), vmInstall.getId());
- validate();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
-
- Button button = SWTUtil.createButton(this, JavaServerUIPlugin.getResource("%runtimeTypeInstalledJREs"));
- button.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String currentVM = combo.getText();
- if (showPreferencePage()) {
- updateJREs();
- combo.setItems(jreNames);
- combo.setText(currentVM);
- if (combo.getSelectionIndex() == -1)
- combo.select(defaultVMIndex);
- }
- }
- });
-
- init();
- validate();
-
- Dialog.applyDialogFont(this);
-
- name.forceFocus();
- }
-
- protected void updateJREs() {
- // get all installed JVMs
- installedJREs = new ArrayList();
- IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
- int size = vmInstallTypes.length;
- for (int i = 0; i < size; i++) {
- IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls();
- int size2 = vmInstalls.length;
- for (int j = 0; j < size2; j++) {
- installedJREs.add(vmInstalls[j]);
- }
- }
-
- // get names
- size = installedJREs.size();
- jreNames = new String[size];
- for (int i = 0; i < size; i++) {
- IVMInstall vmInstall = (IVMInstall) installedJREs.get(i);
- jreNames[i] = vmInstall.getName();
- }
-
- IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
- defaultVMIndex = installedJREs.indexOf(defaultVM);
- }
-
- protected boolean showPreferencePage() {
- PreferenceManager manager = PlatformUI.getWorkbench().getPreferenceManager();
- IPreferenceNode node = manager.find("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage").findSubNode("org.eclipse.jdt.debug.ui.preferences.VMPreferencePage");
- PreferenceManager manager2 = new PreferenceManager();
- manager2.addToRoot(node);
- final PreferenceDialog dialog = new PreferenceDialog(getShell(), manager2);
- final boolean[] result = new boolean[] { false };
- BusyIndicator.showWhile(getDisplay(), new Runnable() {
- public void run() {
- dialog.create();
- if (dialog.open() == Window.OK)
- result[0] = true;
- }
- });
- return result[0];
- }
-
- protected void init() {
- if (installDir == null || runtime == null)
- return;
-
- name.setText(runtimeWC.getName());
-
- if (runtimeWC.getLocation() != null)
- installDir.setText(runtimeWC.getLocation().toOSString());
- else
- installDir.setText("");
-
- // set selection
- boolean found = false;
- int size = installedJREs.size();
- for (int i = 0; i < size; i++) {
- IVMInstall vmInstall = (IVMInstall) installedJREs.get(i);
- if (vmInstall.getVMInstallType().getId().equals(runtime.getVMInstallTypeId())
- && vmInstall.getId().equals(runtime.getVMInstallId())) {
- combo.select(i);
- found = true;
- }
- }
- if (!found)
- combo.select(defaultVMIndex);
- }
-
- protected void validate() {
- if (runtime == null) {
- wizard.setMessage("", IMessageProvider.ERROR);
- return;
- }
-
- IStatus status = runtime.validate();
- if (status == null || status.isOK())
- wizard.setMessage(null, IMessageProvider.NONE);
- else
- wizard.setMessage(status.getMessage(), IMessageProvider.ERROR);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/GenericRuntimeWizardFragment.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/GenericRuntimeWizardFragment.java
deleted file mode 100644
index 0a522ca..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/GenericRuntimeWizardFragment.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jst.server.internal.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-/**
- *
- */
-public class GenericRuntimeWizardFragment extends WizardFragment {
- protected GenericRuntimeComposite comp;
-
- public GenericRuntimeWizardFragment() { }
-
- public boolean hasComposite() {
- return true;
- }
-
- public Composite createComposite(Composite parent, IWizardHandle wizard) {
- comp = new GenericRuntimeComposite(parent, wizard);
- return comp;
- }
-
- public boolean isComplete() {
- IRuntimeWorkingCopy runtime = (IRuntimeWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_RUNTIME);
-
- if (runtime == null)
- return false;
- IStatus status = runtime.validate();
- return (status != null && status.isOK());
- }
-
- public void enter() {
- if (comp != null) {
- IRuntimeWorkingCopy runtime = (IRuntimeWorkingCopy) getTaskModel().getObject(ITaskModel.TASK_RUNTIME);
- comp.setRuntime(runtime);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/ImageResource.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/ImageResource.java
deleted file mode 100644
index 5540d8e..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/ImageResource.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.jst.server.internal.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.net.URL;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.wst.server.ui.internal.Trace;
-/**
- * Utility class to handle image resources.
- */
-public class ImageResource {
- // the image registry
- private static ImageRegistry imageRegistry;
-
- // map of image descriptors since these
- // will be lost by the image registry
- private static Map imageDescriptors;
-
- // map of IElement images
- private static Map elementImages;
-
- // base urls for images
- private static URL ICON_BASE_URL;
-
- static {
- try {
- String pathSuffix = "icons/";
- ICON_BASE_URL = JavaServerUIPlugin.getInstance().getBundle().getEntry(pathSuffix);
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not set icon base URL", e);
- }
- }
-
- private static final String URL_OBJ = "obj16/";
- private static final String URL_WIZBAN = "wizban/";
-
- // Java images
- public static final String IMG_JAVA_CLASSPATH_JAR = "classpathJar";
- public static final String IMG_JAVA_CLASSPATH_VAR = "classpathVar";
- public static final String IMG_JAVA_SYSTEM_PROPERTY = "systemProperty";
- public static final String IMG_RUNTIME_TYPE = "runtimeType";
-
- /**
- * Cannot construct an ImageResource. Use static methods only.
- */
- private ImageResource() {}
-
- /**
- * Dispose of element images that were created.
- */
- protected static void dispose() {
- try {
- Trace.trace("Disposing of element images");
- Iterator iterator = elementImages.values().iterator();
- while (iterator.hasNext()) {
- Image image = (Image) iterator.next();
- image.dispose();
- }
- } catch (Exception e) {
- Trace.trace("Could not dispose of images");
- }
- }
-
- /**
- * Return the image with the given key.
- *
- * @param key java.lang.String
- * @return org.eclipse.swt.graphics.Image
- */
- public static Image getImage(String key) {
- if (imageRegistry == null)
- initializeImageRegistry();
- return imageRegistry.get(key);
- }
-
- /**
- * Return the image descriptor with the given key.
- *
- * @param key java.lang.String
- * @return org.eclipse.jface.resource.ImageDescriptor
- */
- public static ImageDescriptor getImageDescriptor(String key) {
- if (imageRegistry == null)
- initializeImageRegistry();
- return (ImageDescriptor) imageDescriptors.get(key);
- }
-
- /**
- * Initialize the image resources.
- */
- protected static void initializeImageRegistry() {
- imageRegistry = new ImageRegistry();
- imageDescriptors = new HashMap();
-
- // Java images
- registerImage(IMG_JAVA_SYSTEM_PROPERTY, URL_OBJ + "java_system_property.gif");
- registerImage(IMG_JAVA_CLASSPATH_JAR, URL_OBJ + "java_jar.gif");
- registerImage(IMG_JAVA_CLASSPATH_VAR, URL_OBJ + "java_var.gif");
- registerImage(IMG_RUNTIME_TYPE, URL_WIZBAN + "new_runtime_wiz.gif");
- }
-
- /**
- * Register an image with the registry.
- *
- * @param key java.lang.String
- * @param partialURL java.lang.String
- */
- private static void registerImage(String key, String partialURL) {
- try {
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(ICON_BASE_URL, partialURL));
- imageRegistry.put(key, id);
- imageDescriptors.put(key, id);
- } catch (Exception e) {
- Trace.trace("Error registering image " + key + " from " + partialURL, e);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/JavaServerUIPlugin.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/JavaServerUIPlugin.java
deleted file mode 100644
index 77a8179..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/JavaServerUIPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.jst.server.internal.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-/**
- * The main server tooling plugin class.
- */
-public class JavaServerUIPlugin extends AbstractUIPlugin {
- // server java plugin id
- public static final String PLUGIN_ID = "org.eclipse.jst.server.ui";
-
- // singleton instance of this class
- private static JavaServerUIPlugin singleton;
-
- /**
- * Create the JavaServerUIPlugin.
- */
- public JavaServerUIPlugin() {
- super();
- singleton = this;
- }
-
- /**
- * Returns the singleton instance of this plugin.
- *
- * @return org.eclipse.jst.server.ui.JavaServerUIPlugin
- */
- public static JavaServerUIPlugin getInstance() {
- return singleton;
- }
-
- /**
- * Returns the translated String found with the given key.
- *
- * @param key java.lang.String
- * @return java.lang.String
- */
- public static String getResource(String key) {
- try {
- return Platform.getResourceString(getInstance().getBundle(), key);
- } catch (Exception e) {
- return key;
- }
- }
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given arguments using java.text.MessageFormat.
- *
- * @param key java.lang.String
- * @param arguments java.lang.Object[]
- * @return java.lang.String
- */
- public static String getResource(String key, Object[] arguments) {
- try {
- String text = getResource(key);
- return MessageFormat.format(text, arguments);
- } catch (Exception e) {
- return key;
- }
- }
-
- /**
- * Convenience method for logging.
- *
- * @param status org.eclipse.core.runtime.IStatus
- */
- public static void log(IStatus status) {
- getInstance().getLog().log(status);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/SWTUtil.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/SWTUtil.java
deleted file mode 100644
index 3bac0f8..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/SWTUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.jst.server.internal.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-/**
- * SWT Utility class.
- */
-public class SWTUtil {
- private static FontMetrics fontMetrics;
-
- protected static void initializeDialogUnits(Control testControl) {
- // Compute and store a font metric
- GC gc = new GC(testControl);
- gc.setFont(JFaceResources.getDialogFont());
- fontMetrics = gc.getFontMetrics();
- gc.dispose();
- }
-
- /**
- * Returns a width hint for a button control.
- */
- protected static int getButtonWidthHint(Button button) {
- int widthHint = Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_WIDTH);
- return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
- }
-
- public static Button createButton(Composite comp, String label) {
- Button b = new Button(comp, SWT.PUSH);
- b.setText(label);
- if (fontMetrics == null)
- initializeDialogUnits(comp);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = getButtonWidthHint(b);
- data.heightHint = Dialog.convertVerticalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_HEIGHT);
- b.setLayoutData(data);
- return b;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/Trace.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/Trace.java
deleted file mode 100644
index f0f9885..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/internal/ui/Trace.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jst.server.internal.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * Helper class to route trace output.
- */
-public class Trace {
- public static byte CONFIG = 0;
- public static byte WARNING = 1;
- public static byte SEVERE = 2;
- public static byte FINEST = 3;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param s java.lang.String
- */
- public static void trace(byte level, String s) {
- Trace.trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param s java.lang.String
- * @param t java.lang.Throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (!JavaServerUIPlugin.getInstance().isDebugging())
- return;
-
- System.out.println(s);
- if (t != null)
- t.printStackTrace();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/AddClasspathVariableDialog.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/AddClasspathVariableDialog.java
deleted file mode 100644
index e711b8f..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/AddClasspathVariableDialog.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.server.internal.ui.ContextIds;
-import org.eclipse.jst.server.internal.ui.JavaServerUIPlugin;
-import org.eclipse.jst.server.internal.ui.Trace;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Dialog to add a Java classpath variable entry.
- */
-public class AddClasspathVariableDialog extends Dialog {
- protected IClasspathEntry entry;
-
- protected Combo variableCombo;
- protected Text extension;
- protected CLabel resolvedPath;
-
- /**
- * AddClasspathVariableDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- public AddClasspathVariableDialog(Shell parentShell) {
- super(parentShell);
- }
-
- /**
- * AddClasspathVariableDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- public AddClasspathVariableDialog(Shell parentShell, IClasspathEntry entry) {
- super(parentShell);
- this.entry = entry;
- }
-
- /**
- * Notifies that the cancel button of this dialog has been pressed.
- * <p>
- * The <code>Dialog</code> implementation of this framework method sets
- * this dialog's return code to <code>Window.CANCEL</code>
- * and closes the dialog. Subclasses may override if desired.
- * </p>
- */
- protected void cancelPressed() {
- entry = null;
- super.cancelPressed();
- }
-
- protected IPath chooseExternalJarFile(Shell shell, String initialPath) {
- FileDialog dialog = new FileDialog(shell, SWT.SINGLE);
- dialog.setText(JavaServerUIPlugin.getResource("%javaAddExternalJarDialog"));
- dialog.setFilterExtensions(new String[] {"*.jar;*.zip"});
- dialog.setFilterPath(initialPath);
- String res = dialog.open();
-
- if (res != null)
- return new Path(res).makeAbsolute();
-
- return null;
- }
-
- /**
- *
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(JavaServerUIPlugin.getResource("%javaAddVariableDialogTitle"));
- }
-
- /**
- * Creates and returns the contents of the upper part
- * of this dialog (above the button bar).
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * creates and returns a new <code>Composite</code> with
- * standard margins and spacing. Subclasses should override.
- * </p>
- *
- * @param the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- WorkbenchHelp.setHelp(composite, ContextIds.JAVA_CLASSPATH_VARIABLE_DIALOG);
-
- new Label(composite, SWT.NONE).setText(JavaServerUIPlugin.getResource("%javaAddVariableDialogName"));
-
- variableCombo = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
- String[] variables = JavaCore.getClasspathVariableNames();
- variableCombo.setItems(variables);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- data.widthHint = 200;
- variableCombo.setLayoutData(data);
- variableCombo.select(0);
- WorkbenchHelp.setHelp(composite, ContextIds.JAVA_CLASSPATH_VARIABLE_DIALOG_VARIABLE);
-
- new Label(composite, SWT.NONE).setText("");
-
- new Label(composite, SWT.NONE).setText(JavaServerUIPlugin.getResource("%javaAddVariableDialogExtension"));
- extension = new Text(composite, SWT.BORDER);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- extension.setLayoutData(data);
- WorkbenchHelp.setHelp(composite, ContextIds.JAVA_CLASSPATH_VARIABLE_DIALOG_EXTENSION);
-
- Button browse = new Button(composite, SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- browse.setLayoutData(data);
- browse.setText(JavaServerUIPlugin.getResource("%javaBrowse"));
- browse.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String initialPath = null;
- String text = variableCombo.getText();
- IPath varPath = new Path(text);
- IPath resolved = JavaCore.getResolvedVariablePath(varPath);
- if (resolved != null)
- initialPath = resolved.toOSString();
-
- IPath path = chooseExternalJarFile(getShell(), initialPath);
- if (path != null) {
- if (resolved != null && resolved.isPrefixOf(path)) {
- path = path.removeFirstSegments(resolved.segmentCount());
- path = path.setDevice(null);
- }
- extension.setText(path.toString());
- }
- }
- });
- WorkbenchHelp.setHelp(composite, ContextIds.JAVA_CLASSPATH_VARIABLE_DIALOG_EXTENSION_BROWSE);
-
- new Label(composite, SWT.NONE).setText(JavaServerUIPlugin.getResource("%javaAddVariableDialogResolved"));
-
- resolvedPath = new CLabel(composite, SWT.NONE);
- resolvedPath.setText("");
- data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- resolvedPath.setLayoutData(data);
-
- if (entry != null) {
- String var = entry.getPath().segment(0);
- int size = variables.length;
- for (int i = 0; i < size; i++) {
- if (variables[i].equals(var))
- variableCombo.select(i);
- }
-
- String rest = entry.getPath().removeFirstSegments(1).toString();
- extension.setText(rest);
- }
-
- variableCombo.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- handleSelection();
- }
- });
- extension.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- handleSelection();
- }
- });
-
- handleSelection();
-
- Dialog.applyDialogFont(composite);
-
- return composite;
- }
-
- /**
- * Return the classpath entry.
- *
- * @return
- */
- public IClasspathEntry getClasspathEntry() {
- return entry;
- }
-
- /**
- *
- */
- protected void handleSelection() {
- try {
- int index = variableCombo.getSelectionIndex();
- String var = variableCombo.getItem(index);
-
- String path = extension.getText();
- if (path != null && !path.startsWith("/"))
- path = "/" + path;
-
- entry = JavaCore.newVariableEntry(new Path(var + path), null, null);
-
- IPath resolved = JavaCore.getResolvedVariablePath(new Path(var + path));
- if (resolved == null)
- resolvedPath.setText("");
- else
- resolvedPath.setText(resolved.toString());
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "JavaUI selection error", e);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IClasspathEditor.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IClasspathEditor.java
deleted file mode 100644
index 2829c13..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IClasspathEditor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jdt.core.IClasspathEntry;
-/**
- * An generic interface for modifying the classpath of a Java server.
- * Can be used to implement the command pattern between the editor and
- * the server.
- */
-public interface IClasspathEditor {
- /**
- * Add classpath entries to the server.
- *
- * @param entries org.eclipse.jdt.core.IClasspathEntry[]
- */
- public void addClasspathEntries(IClasspathEntry[] entries);
-
- /**
- * Edit a classpath entry on the server.
- *
- * @param entries org.eclipse.jdt.core.IClasspathEntry[]
- */
- public void editClasspathEntry(int i, IClasspathEntry entry);
-
- /**
- * Remove a classpath entry from the server.
- *
- * @param entry org.eclipse.jdt.core.IClasspathEntry
- */
- public void removeClasspathEntry(IClasspathEntry entry);
-
- /**
- * Swap two classpath entries in the server.
- *
- * @param i int
- * @param j int
- */
- public void swapClasspathEntries(int i, int j);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IPathEditor.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IPathEditor.java
deleted file mode 100644
index 64be48d..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IPathEditor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * An generic interface for modifying the path of a Java server. Can be used
- * to implement the command pattern between the editor and the server.
- */
-public interface IPathEditor {
- /**
- * Set the system path for this server.
- *
- * @param s java.lang.String
- */
- public void setPath(String s);
-
- /**
- * Set the system path type for this server.
- *
- * @param t int
- */
- public void setPathType(int t);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/ISystemPropertyEditor.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/ISystemPropertyEditor.java
deleted file mode 100644
index 1e10909..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/ISystemPropertyEditor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.core.SystemProperty;
-/**
- * An generic interface for modifying the system properties of
- * a Java server. Can be used to implement the command
- * pattern between the editor and the server.
- */
-public interface ISystemPropertyEditor {
- /**
- * Add a system property to the server.
- *
- * @param property org.eclipse.jst.server.ui.SystemProperty
- */
- public void addSystemProperty(SystemProperty property);
-
- /**
- * Edit a system property on the server.
- *
- * @param oldProperty org.eclipse.jst.server.ui.SystemProperty
- * @param newProperty org.eclipse.jst.server.ui.SystemProperty
- */
- public void modifySystemProperty(SystemProperty oldProperty, SystemProperty newProperty);
-
- /**
- * Remove a system property from the server.
- *
- * @param property org.eclipse.jst.server.ui.SystemProperty
- */
- public void removeSystemProperty(SystemProperty property);
-}
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IVMArgumentEditor.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IVMArgumentEditor.java
deleted file mode 100644
index 6542dfa..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/IVMArgumentEditor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-/**
- * An generic interface for modifying the VM arguments of a Java
- * server. Can be used to implement the command
- * pattern between the editor and the server.
- */
-public interface IVMArgumentEditor {
- /**
- * Set the VM arguments for this server.
- *
- * @param s java.lang.String[]
- */
- public void setVMArguments(String[] s);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaContextIds.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaContextIds.java
deleted file mode 100644
index 1ca57fc..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaContextIds.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.internal.ui.ContextIds;
-/**
- * Java Context Ids
- */
-public interface JavaContextIds extends ContextIds {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaImages.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaImages.java
deleted file mode 100644
index 944eacb..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaImages.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.server.internal.ui.ImageResource;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- */
-public class JavaImages {
- // Java images
- public static final String IMG_JAVA_CLASSPATH_JAR = ImageResource.IMG_JAVA_CLASSPATH_JAR;
- public static final String IMG_JAVA_CLASSPATH_VAR = ImageResource.IMG_JAVA_CLASSPATH_JAR;
- public static final String IMG_JAVA_SYSTEM_PROPERTY = ImageResource.IMG_JAVA_CLASSPATH_JAR;
-
- /**
- * Return the image with the given key.
- *
- * @param key java.lang.String
- * @return org.eclipse.swt.graphics.Image
- */
- public static Image getImage(String key) {
- return ImageResource.getImage(key);
- }
-
- /**
- * Return the image descriptor with the given key.
- *
- * @param key java.lang.String
- * @return org.eclipse.jface.resource.ImageDescriptor
- */
- public static ImageDescriptor getImageDescriptor(String key) {
- return ImageResource.getImageDescriptor(key);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaResources.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaResources.java
deleted file mode 100644
index 38eb5ee..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/JavaResources.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jst.server.internal.ui.JavaServerUIPlugin;
-/**
- *
- */
-public class JavaResources {
- /**
- * Returns the translated String found with the given key.
- *
- * @param key java.lang.String
- * @return java.lang.String
- */
- public static String getResource(String key) {
- return JavaServerUIPlugin.getResource(key);
- }
-
- /**
- * Returns the translated String found with the given key,
- * and formatted with the given arguments using java.text.MessageFormat.
- *
- * @param key java.lang.String
- * @param arguments java.lang.Object[]
- * @return java.lang.String
- */
- public static String getResource(String key, Object[] arguments) {
- return JavaServerUIPlugin.getResource(key, arguments);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/StringClasspathDialog.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/StringClasspathDialog.java
deleted file mode 100644
index ef8e08f..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/StringClasspathDialog.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.server.internal.ui.ContextIds;
-import org.eclipse.jst.server.internal.ui.JavaServerUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Dialog to add a string classpath.
- */
-public class StringClasspathDialog extends Dialog {
- protected String cp;
- protected Button okay;
- protected boolean isForceAbsolutePath = true;
- protected boolean isEdit;
-
- /**
- * SystemPropertyDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- public StringClasspathDialog(Shell parentShell) {
- this(parentShell, "");
- isEdit = false;
- }
-
- public StringClasspathDialog(Shell parentShell, boolean curIsForceAbsolutePath) {
- this(parentShell);
- isForceAbsolutePath = curIsForceAbsolutePath;
- }
-
- /**
- * SystemPropertyDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- public StringClasspathDialog(Shell parentShell, String cp) {
- super(parentShell);
- this.cp = cp;
- isEdit = true;
- }
-
- /**
- * Notifies that the cancel button of this dialog has been pressed.
- * <p>
- * The <code>Dialog</code> implementation of this framework method sets
- * this dialog's return code to <code>Window.CANCEL</code>
- * and closes the dialog. Subclasses may override if desired.
- * </p>
- */
- protected void cancelPressed() {
- cp = null;
- super.cancelPressed();
- }
-
- /**
- *
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isEdit)
- newShell.setText(JavaServerUIPlugin.getResource("%javaEditStringDialogTitle"));
- else
- newShell.setText(JavaServerUIPlugin.getResource("%javaAddStringDialogTitle"));
- }
-
- /**
- * Adds buttons to this dialog's button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method adds
- * standard ok and cancel buttons using the <code>createButton</code>
- * framework method. Subclasses may override.
- * </p>
- *
- * @param parent the button bar composite
- */
- protected void createButtonsForButtonBar(Composite parent) {
- // create OK and Cancel buttons by default
- okay = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
- okay.setEnabled(false);
- createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
- }
-
- /**
- * Creates and returns the contents of the upper part
- * of this dialog (above the button bar).
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * creates and returns a new <code>Composite</code> with
- * standard margins and spacing. Subclasses should override.
- * </p>
- *
- * @param the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- WorkbenchHelp.setHelp(composite, ContextIds.JAVA_CLASSPATH_STRING_DIALOG);
-
- new Label(composite, SWT.NONE).setText(JavaServerUIPlugin.getResource("%javaAddStringDialogPath"));
- final Text nameText = new Text(composite, SWT.BORDER);
- GridData data = new GridData();
- data.widthHint = 225;
- nameText.setLayoutData(data);
- nameText.setText(cp);
-
- final Label invalid = new Label(composite, SWT.NONE);
- invalid.setText("");
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- invalid.setLayoutData(data);
-
- nameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- cp = nameText.getText();
-
- IPath path = new Path(cp);
- if (cp != null && cp.length() == 0) {
- invalid.setText("");
- okay.setEnabled(false);
- } else if (!path.isAbsolute() && isForceAbsolutePath) {
- invalid.setText(JavaServerUIPlugin.getResource("%javaAddStringDialogInvalidPath"));
- okay.setEnabled(false);
- } else {
- invalid.setText("");
- okay.setEnabled(true);
- }
- }
- });
- WorkbenchHelp.setHelp(nameText, ContextIds.JAVA_CLASSPATH_STRING_DIALOG_PATH);
-
- Dialog.applyDialogFont(composite);
- return composite;
- }
-
- /**
- * Return the classpath.
- *
- * @return java.lang.String
- */
- public String getClasspath() {
- return cp;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/SystemPropertyDialog.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/SystemPropertyDialog.java
deleted file mode 100644
index 51d33ac..0000000
--- a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/SystemPropertyDialog.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.eclipse.jst.server.ui;
-/**********************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.server.core.SystemProperty;
-import org.eclipse.jst.server.internal.ui.ContextIds;
-import org.eclipse.jst.server.internal.ui.JavaServerUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Dialog to add or modify system properties.
- */
-public class SystemPropertyDialog extends Dialog {
- protected SystemProperty sp;
- protected boolean isEdit;
-
- protected Text nameText;
- protected Text valueText;
-
- private Button okButton;
-
- /**
- * SystemPropertyDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- public SystemPropertyDialog(Shell parentShell) {
- this(parentShell, new SystemProperty("", ""));
- isEdit = false;
- }
-
- /**
- * SystemPropertyDialog constructor comment.
- * @param parentShell org.eclipse.swt.widgets.Shell
- */
- public SystemPropertyDialog(Shell parentShell, SystemProperty sp) {
- super(parentShell);
- this.sp = sp;
- isEdit = true;
- }
-
- /**
- *
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isEdit)
- newShell.setText(JavaServerUIPlugin.getResource("%javaSystemPropertyEditDialog"));
- else
- newShell.setText(JavaServerUIPlugin.getResource("%javaSystemPropertyAddDialog"));
- }
-
- /**
- * Creates and returns the contents of the upper part
- * of this dialog (above the button bar).
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * creates and returns a new <code>Composite</code> with
- * standard margins and spacing. Subclasses should override.
- * </p>
- *
- * @param the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- WorkbenchHelp.setHelp(composite, ContextIds.JAVA_SYSTEM_PROPERTY_DIALOG);
-
- new Label(composite, SWT.NONE).setText(JavaServerUIPlugin.getResource("%javaSystemPropertyName"));
- nameText = new Text(composite, SWT.BORDER);
- GridData data = new GridData();
- data.widthHint = 200;
- nameText.setLayoutData(data);
- nameText.setText(sp.getName());
- nameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- sp = new SystemProperty(nameText.getText(), sp.getValue());
- validateFields();
- }
- });
- WorkbenchHelp.setHelp(nameText, ContextIds.JAVA_SYSTEM_PROPERTY_DIALOG_NAME);
-
- new Label(composite, SWT.NONE).setText(JavaServerUIPlugin.getResource("%javaSystemPropertyValue"));
- valueText = new Text(composite, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- valueText.setLayoutData(data);
- valueText.setText(sp.getValue());
- valueText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- sp = new SystemProperty(sp.getName(), valueText.getText());
- validateFields();
- }
- });
- WorkbenchHelp.setHelp(valueText, ContextIds.JAVA_SYSTEM_PROPERTY_DIALOG_VALUE);
-
- Dialog.applyDialogFont(composite);
- return composite;
- }
-
- /**
- * Return the system property.
- *
- * @return org.eclipse.jst.server.ui.SystemProperty
- */
- public SystemProperty getSystemProperty() {
- return sp;
- }
-
- /**
- * Initialize the Ok button
- *
- * @param the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected Control createButtonBar(Composite parent) {
- Control buttonControl = super.createButtonBar(parent);
- // Initialize the ok button state after the ok button is created.
- validateFields();
-
- return buttonControl;
- }
-
- /**
- * Enable Ok button
- *
- * @param boolean value used to enable Ok button
- */
- private void setOkButtonEnabled(boolean curIsEnabled) {
- if (okButton == null) {
- okButton = getButton(IDialogConstants.OK_ID);
- }
- if (okButton != null) {
- okButton.setEnabled(curIsEnabled);
- }
- }
-
- /**
- * Enables the Ok button for the required fields that require a value
- *
- */
- protected void validateFields() {
- boolean result = true;
-
- if (nameText != null) {
- String curName = nameText.getText();
- result &= (curName != null && curName.length() > 0);
- }
-
- setOkButtonEnabled(result);
- }
-}