Bug 519793 - remove org.eclipse.wst.web, org.eclipse.wst.web.ui and org.eclipse.wst.web.ui.infopop from webtools.javaee as they've moved upstream to webtools.sourceediting
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore b/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.project b/docs/org.eclipse.wst.web.ui.infopop/.project
deleted file mode 100644
index 10c4a6e..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web.ui.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a60c52..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Static Web infopop
-Bundle-SymbolicName: org.eclipse.wst.web.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml b/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
deleted file mode 100644
index bf0f403..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 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
- *******************************************************************************/ -->
-<contexts>
-<context id="webw2000">
-<description> Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to publish the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. </description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. The Static Web Module facet enables the project to be deployed as a static
-Web module. Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2200">
-<description>The Web content folder is where the elements of your Web site such as Web pages, graphics and style sheets are stored. This directory structure is necessary to ensure that the content of your Web site will be included in the WAR file at deployment and that link validation will work correctly.
-</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/about.html b/docs/org.eclipse.wst.web.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/build.properties b/docs/org.eclipse.wst.web.ui.infopop/build.properties
deleted file mode 100644
index 0c7c1a9..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = StaticWebWizContexts.xml,\
- about.html,\
- plugin.xml,\
- plugin.properties,\
- META-INF/
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties b/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
deleted file mode 100644
index b61d2de..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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 = Static Web infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml b/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
deleted file mode 100644
index 20ac018..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
- <contexts file="StaticWebWizContexts.xml" plugin ="org.eclipse.wst.web.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/pom.xml b/docs/org.eclipse.wst.web.ui.infopop/pom.xml
deleted file mode 100644
index 01e749b..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
--->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.webtools.javaee</groupId>
- <artifactId>javaee.docs</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.eclipse.webtools.javaee</groupId>
- <artifactId>org.eclipse.wst.web.ui.infopop</artifactId>
- <version>1.0.300-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/docs/pom.xml b/docs/pom.xml
index f854146..24e7016 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -31,6 +31,5 @@
<module>org.eclipse.jst.j2ee.doc.user</module>
<module>org.eclipse.jst.j2ee.infopop</module>
<module>org.eclipse.jst.servlet.ui.infopop</module>
- <module>org.eclipse.wst.web.ui.infopop</module>
</modules>
</project>
diff --git a/plugins/org.eclipse.wst.web.ui/.classpath b/plugins/org.eclipse.wst.web.ui/.classpath
deleted file mode 100644
index b0b3094..0000000
--- a/plugins/org.eclipse.wst.web.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="static_web_ui"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web.ui/.gitignore b/plugins/org.eclipse.wst.web.ui/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/plugins/org.eclipse.wst.web.ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/plugins/org.eclipse.wst.web.ui/.project b/plugins/org.eclipse.wst.web.ui/.project
deleted file mode 100644
index 3858f90..0000000
--- a/plugins/org.eclipse.wst.web.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web.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.wst.web.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 37a03d7..0000000
--- a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.web.ui; singleton:=true
-Bundle-Version: 1.1.601.qualifier
-Bundle-Activator: org.eclipse.wst.web.ui.internal.WSTWebUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.web.ui.internal,
- org.eclipse.wst.web.ui.internal.wizards
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.search;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.css.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.html.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.jsdt.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.web.ui/about.html b/plugins/org.eclipse.wst.web.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.web.ui/about.ini b/plugins/org.eclipse.wst.web.ui/about.ini
deleted file mode 100644
index 68af291..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
-
diff --git a/plugins/org.eclipse.wst.web.ui/about.mappings b/plugins/org.eclipse.wst.web.ui/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/about.properties b/plugins/org.eclipse.wst.web.ui/about.properties
deleted file mode 100644
index 839c201..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 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
-###############################################################################
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Eclipse Web Developer Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/plugins/org.eclipse.wst.web.ui/build.properties b/plugins/org.eclipse.wst.web.ui/build.properties
deleted file mode 100644
index 3bc606f..0000000
--- a/plugins/org.eclipse.wst.web.ui/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- .,\
- about.properties,\
- about.mappings,\
- about.ini
-jars.compile.order = .
-source.. = static_web_ui/
-output.. = bin/
diff --git a/plugins/org.eclipse.wst.web.ui/icons/WTP_icon_x32_v2.png b/plugins/org.eclipse.wst.web.ui/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif b/plugins/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif
deleted file mode 100644
index c7b3278..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png
deleted file mode 100644
index 1edd090..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.properties b/plugins/org.eclipse.wst.web.ui/plugin.properties
deleted file mode 100644
index 7ae3b12..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2009.
-# All Rights Reserved.
-#########################################
-
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = Eclipse Web Developer Tools
-
-
-StaticWebProject.name=Static Web Project
-StaticWebProject.description=Create a Web project for static content (HTML files) only
-
-StaticWebSettings=Simple Web
-WebProjectFeatures.name=Web Project Features
-web.category_ui_=Web
-StaticWebModule.name=Simple Web Module
-perspective.name = Web
-webActionSet.label = Web Project Wizards Action Set
-action.label.CSS = CSS
-action.tooltip.CSS = Create a new Cascading Style Sheet
-action.label.JS = JavaScript
-action.tooltip.JS = Create a new JavaScript file
-action.label.HTML = HTML
-action.tooltip.HTML = Create a new HTML page
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.xml b/plugins/org.eclipse.wst.web.ui/plugin.xml
deleted file mode 100644
index 634c030..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <!-- static web project wizard -->
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%StaticWebProject.name"
- icon="icons/full/ctool16/newwebprj_wiz.gif"
- category="org.eclipse.wst.web.ui"
- class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard"
- project="true"
- finalPerspective="org.eclipse.wst.web.ui.webDevPerspective"
- id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard">
- <description>
- %StaticWebProject.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension> -->
-
- <!-- the following 2 are needed to add an image for SWPs into the "Add/Remove Project" dialog -->
- <extension point="org.eclipse.wst.server.core.moduleTypes">
- <moduleType
- id="web.static"
- name="%StaticWebModule.name"/>
- </extension>
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- id="org.eclipse.wst.web.static"
- typeIds="web.static"
- icon="icons/full/obj16/web_application.gif"/>
- </extension>
-
-
-<!-- ====================================================== -->
-<!-- Extension point: org.eclipse.ui.projectNatureImages -->
-<!-- Purpose: Attach icon overlays for J2EE project natures -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.ide.projectNatureImages">
- <image
- icon="icons/full/ovr16/web_module_ovr.gif"
- natureId="org.eclipse.wst.web.StaticWebNature"
- id="org.eclipse.ui.simpleWebProjectNatureImage">
- </image>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="wst.web.install">
- <page class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebFacetInstallPage"/>
- </wizard-pages>
- </extension>
-
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.wst.common.modulecore.ModuleCoreValidatorMarker"
- class="org.eclipse.wst.web.ui.internal.ModuleCoreValidatorMarkerResolutions">
- </markerResolutionGenerator>
- </extension>
-
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- name="%perspective.name"
- icon="icons/full/cview16/web_perspective.gif"
- class="org.eclipse.wst.web.ui.internal.WebDevelopmentPerspective"
- id="org.eclipse.wst.web.ui.webDevPerspective">
- </perspective>
- </extension>
- <extension point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.wst.web.ui.webDevPerspective">
-
- <actionSet id="org.eclipse.debug.ui.launchActionSet"/>
- <actionSet id="org.eclipse.wst.web.ui.wizardsActionSet" />
- <actionSet id="org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
- <actionSet id="org.eclipse.debug.ui.breakpointActionSet"/>
-
- <newWizardShortcut id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard"/>
- <newWizardShortcut id="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"/>
- <newWizardShortcut id="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard"/>
- <newWizardShortcut id="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard"/>
- <newWizardShortcut id="org.eclipse.wst.jsdt.ui.NewJSWizard"/>
- <newWizardShortcut id="org.eclipse.ui.wizards.new.folder"/>
- <newWizardShortcut id="org.eclipse.ui.wizards.new.file"/>
-
- <viewShortcut id="org.eclipse.ui.navigator.ProjectExplorer"/>
- <viewShortcut id="org.eclipse.ui.views.ContentOutline"/>
- <viewShortcut id="org.eclipse.ui.views.PropertySheet"/>
- <viewShortcut id="org.eclipse.ui.views.ProblemView"/>
- <viewShortcut id="org.eclipse.wst.server.ui.ServersView"/>
-
- <perspectiveShortcut id="org.eclipse.jdt.ui.JavaPerspective"/>
- </perspectiveExtension>
- </extension>
-
- <!-- Toolbar action set for web project and HTML, JS and CSS files -->
- <extension point="org.eclipse.ui.actionSets">
- <actionSet
- id="org.eclipse.wst.web.ui.wizardsActionSet"
- label="%webActionSet.label">
- <action
- class="org.eclipse.wst.web.ui.internal.actions.OpenCSSWizardAction"
- icon="platform:/plugin/org.eclipse.wst.css.ui/icons/full/etool16/newcss_wiz.gif"
- id="org.eclipse.wst.web.ui.actions.newCSSFile"
- label="%action.label.CSS"
- style="push"
- toolbarPath="Normal/webActions"
- tooltip="%action.tooltip.CSS" />
- <action
- class="org.eclipse.wst.web.ui.internal.actions.OpenJSWizardAction"
- icon="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/etool16/newjscript_wiz.gif"
- id="org.eclipse.wst.web.ui.actions.newJSFile"
- label="%action.label.JS"
- style="push"
- toolbarPath="Normal/webActions"
- tooltip="%action.tooltip.JS" />
- <action
- class="org.eclipse.wst.web.ui.internal.actions.OpenHTMLWizardAction"
- icon="platform:/plugin/org.eclipse.wst.html.ui/icons/full/etool16/newhtml_wiz.gif"
- id="org.eclipse.wst.web.ui.actions.newHTMLFile"
- label="%action.label.HTML"
- style="push"
- toolbarPath="Normal/webActions"
- tooltip="%action.tooltip.HTML" />
- </actionSet>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </or>
- </adapt>
- </and>
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.web.ui/pom.xml b/plugins/org.eclipse.wst.web.ui/pom.xml
deleted file mode 100644
index 3daabff..0000000
--- a/plugins/org.eclipse.wst.web.ui/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
--->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.webtools.javaee</groupId>
- <artifactId>javaee.plugins</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.eclipse.webtools.javaee</groupId>
- <artifactId>org.eclipse.wst.web.ui</artifactId>
- <version>1.1.601-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java
deleted file mode 100644
index e3357cc..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.web.ui"; //$NON-NLS-1$
- /**
- * true if both platform and this plugin are in debug mode
- */
- public static final boolean DEBUG = Platform.inDebugMode() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.web.ui/debug")); //$NON-NLS-1$ //$NON-NLS-2$
-
- /*
- * Keep our own copy in case we want to add other severity levels
- */
- public static final int OK = IStatus.OK;
- public static final int INFO = IStatus.INFO;
- public static final int WARNING = IStatus.WARNING;
- public static final int ERROR = IStatus.ERROR;
-
- /**
- * Adds message to log.
- *
- * @param level
- * severity level of the message (OK, INFO, WARNING, ERROR,
- * @param message
- * text to add to the log
- * @param exception
- * exception thrown
- */
- private static void _log(int level, String message, Throwable exception) {
- Status statusObj = new Status(level, PLUGIN_ID, level, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Write a message to the log with the given severity level
- *
- * @param level
- * ERROR, WARNING, INFO, OK
- * @param message
- * message to add to the log
- */
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- /**
- * Writes a message and exception to the log with the given severity level
- *
- * @param level
- * ERROR, WARNING, INFO, OK
- * @param message
- * message to add to the log
- * @param exception
- * exception to add to the log
- */
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- /**
- * Writes the exception as an error in the log along with an accompanying
- * message
- *
- * @param message
- * message to add to the log
- * @param exception
- * exception to add to the log
- */
- public static void logException(String message, Throwable exception) {
- _log(IStatus.ERROR, message, exception);
- }
-
- /**
- * Writes the exception as an error in the log
- *
- * @param exception
- * exception to add to the log
- */
- public static void logException(Throwable exception) {
- _log(IStatus.ERROR, exception.getMessage(), exception);
- }
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java
deleted file mode 100644
index 7a59260..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * 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:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.web.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
-import org.eclipse.wst.common.componentcore.internal.ModuleMigratorManager;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-/**
- * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
- * @deprecated
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public final class ModuleCoreValidatorMarkerResolutions
-
- implements IMarkerResolutionGenerator
-
-{
- public IMarkerResolution[] getResolutions( IMarker marker )
- {
- return new IMarkerResolution[]
- {
- new ModuleCoreMigrationResolution( marker )
- };
- }
-
- private class ModuleCoreMigrationResolution extends WorkbenchMarkerResolution
-
- {
- private final IMarker theMarker;
- private final String MARKERTYPE = "org.eclipse.wst.common.modulecore.ModuleCoreValidatorMarker"; //$NON-NLS-1$
-
- public ModuleCoreMigrationResolution( IMarker marker )
- {
- this.theMarker = marker;
- }
-
- public String getLabel()
- {
- return Resources.migrateMetaData;
- }
-
-
-
- public void run( IMarker marker )
- {
-
- IProject proj = marker.getResource().getProject();
-
- try
- {
- ModuleMigratorManager manager = ModuleMigratorManager.getManager(proj);
- if (!manager.isMigrating() && !ResourcesPlugin.getWorkspace().isTreeLocked())
- manager.migrateOldMetaData(proj,true);
- }
- catch( Exception e )
- {
- WSTWebUIPlugin.logError(e);
- }
- }
-
- public String getDescription() {
- return Resources.migrateMetaData;
- }
-
- public Image getImage() {
- return null;
- }
-
- @Override
- public IMarker[] findOtherMarkers(IMarker[] markers) {
- List marks = new ArrayList();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- try {
- if (marker.getType().equals(MARKERTYPE) && !(marker.equals(theMarker)))
- marks.add(marker);
- } catch (CoreException e) {
- WSTWebUIPlugin.logError(e);
- }
- }
- return (IMarker[])marks.toArray(new IMarker[marks.size()]);
- }
-
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String migrateMetaData;
-
- static
- {
- initializeMessages( ModuleCoreValidatorMarkerResolutions.class.getName(),
- Resources.class );
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties
deleted file mode 100644
index 4491dfe..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-migrateMetaData=Migrate metadata
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
deleted file mode 100644
index 931f9ef..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.web.ui.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
- public interface Keys {
- final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
- }
- public interface Values {
- final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- }
- public interface Defaults {
- final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
- }
- private Plugin owner = null;
- private Preferences preferences = null;
- private boolean persistOnChange = false;
-
- public WSTWebPreferences(Plugin owner) {
- this.owner = owner;
- }
- protected void initializeDefaultPreferences() {
- getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
- }
-
- public String getStaticWebContentFolderName() {
- return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
- }
-
- public void setStaticWebContentFolderName(String value) {
- getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
- firePreferenceChanged();
- }
-
- public void firePreferenceChanged() {
- if (isPersistOnChange())
- persist();
- }
-
- public void persist() {
- getOwner().savePluginPreferences();
- }
-
- /**
- * @return Returns the persistOnChange.
- */
- public boolean isPersistOnChange() {
- return this.persistOnChange;
- }
-
- /**
- * @param persistOnChange
- * The persistOnChange to set.
- */
- public void setPersistOnChange(boolean persistOnChange) {
- this.persistOnChange = persistOnChange;
- }
-
- private Preferences getPreferences() {
- if (this.preferences == null)
- this.preferences = getOwner().getPluginPreferences();
- return this.preferences;
- }
-
- /**
- * @return Returns the owner.
- */
- private Plugin getOwner() {
- return this.owner;
- }
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
deleted file mode 100644
index 5e37665..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.wst.web.ui"; //$NON-NLS-1$
-
- // The shared instance.
- private static WSTWebUIPlugin plugin;
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- /**
- * The constructor.
- */
- public WSTWebUIPlugin() {
- super();
- plugin = this;
- }
- /**
- * This method is called upon plug-in activation
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL imageURL = getImageURL(key, getBundle());
- if (imageURL==null)
- imageURL = getPNGImageURL(key, getBundle());
- if (imageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(imageURL);
- return imageDescriptor;
- }
- /**
- * This gets a .gif from the icons folder.
- */
- public static URL getImageURL(String key, Bundle bundle) {
- String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = null;
- for (int i = 0; i < ICON_DIRS.length; i++) {
- path = new Path(ICON_DIRS[i]).append(gif);
- if (bundle.getEntry(path.toString()) == null)
- continue;
- try {
- return new URL(bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- Logger.log(Logger.WARNING, "Load_Image_Error_", exception); //$NON-NLS-1$
- continue;
- }
- }
- return null;
- }
-
- /**
- * This gets a .png from the icons folder.
- */
- public static URL getPNGImageURL(String key, Bundle bundle) {
- String gif = "/" + key + ".png"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = null;
- for (int i = 0; i < ICON_DIRS.length; i++) {
- path = new Path(ICON_DIRS[i]).append(gif);
- if (bundle.getEntry(path.toString()) == null)
- continue;
- try {
- return new URL(bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- Logger.log(Logger.WARNING, "Load_Image_Error_", exception); //$NON-NLS-1$
- continue;
- }
- }
- return null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static WSTWebUIPlugin getDefault() {
- return plugin;
- }
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java
deleted file mode 100644
index 2445ff1..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.progress.IProgressConstants;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class WebDevelopmentPerspective implements IPerspectiveFactory {
-
- public static final String ID = "org.eclipse.wst.web.ui.webDevPerspective"; //$NON-NLS-1$
-
- protected static final String TOP_LEFT_LOCATION = "topLeft"; //$NON-NLS-1$
- protected static final String BOTTOM_LEFT_LOCATION = "bottomLeft"; //$NON-NLS-1$
- protected static final String BOTTOM_RIGHT_LOCATION = "bottomRight"; //$NON-NLS-1$
- protected static final String TOP_RIGHT_LOCATION = "topRight"; //$NON-NLS-1$
- protected static final String BOTTOM_LOCATION = "bottom"; //$NON-NLS-1$
-
- // view id's
- protected static String ID_PROJECT_EXPLORER = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
- protected static final String ID_SERVER = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$
- protected static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$
-
- public WebDevelopmentPerspective() {
- super();
- //If preference exists for alternate view, replace.
- String viewerID = ProductManager.getProperty(IProductConstants.ID_PERSPECTIVE_HIERARCHY_VIEW);
- if (viewerID != null) {
- // verify that the view actually exists
- if (PlatformUI.getWorkbench().getViewRegistry().find(viewerID) != null){
- ID_PROJECT_EXPLORER = viewerID;
- }
- }
- }
-
- /*
- *____ ________________ _____
- *| | | |
- *| P | | O |
- *| R | ED | u |
- *| o | | t |
- *| j | | l |
- *| |________________| i |
- *| E | | n |
- *| X | PROB/SERV/PROP | e |
- *|_P__|________________|_____|
- *
- */
- public void createInitialLayout(IPageLayout layout) {
- // everything is based off the editor area
- String editorArea = layout.getEditorArea();
-
- // LEFT Area (Project Explorer)
- IFolderLayout topLeft = layout.createFolder(TOP_LEFT_LOCATION,
- IPageLayout.LEFT, 0.25f, editorArea);
- topLeft.addView(ID_PROJECT_EXPLORER);
- topLeft.addPlaceholder(IPageLayout.ID_RES_NAV);
-
- // TOP RIGHT Area (Outline)
- IFolderLayout topRight = layout.createFolder(TOP_RIGHT_LOCATION,
- IPageLayout.RIGHT, 0.80f, editorArea);
- topRight.addView(IPageLayout.ID_OUTLINE);
- topRight.addView(ID_WST_SNIPPETS_VIEW);
-
- // BOTTOM Area (Problems, Server, Properties)
- IFolderLayout bottom = layout.createFolder(BOTTOM_LOCATION,
- IPageLayout.BOTTOM, 0.70f, editorArea);
- bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
- bottom.addView(ID_SERVER);
- bottom.addView(IPageLayout.ID_PROP_SHEET);
- bottom.addPlaceholder(NewSearchUI.SEARCH_VIEW_ID);
- bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW);
- bottom.addPlaceholder(IPageLayout.ID_BOOKMARKS);
- bottom.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
- bottom.addPlaceholder(IPageLayout.ID_TASK_LIST);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/AbstractOpenWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/AbstractOpenWizardAction.java
deleted file mode 100644
index 809dfe2..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/AbstractOpenWizardAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.IWorkbenchWizard;
-
-public abstract class AbstractOpenWizardAction implements IWorkbenchWindowActionDelegate
-{
-
- private IWorkbenchWindow window;
-
- public AbstractOpenWizardAction()
- {
- super();
- }
-
- public void dispose()
- {
- }
-
- public void init( IWorkbenchWindow window )
- {
- this.window = window;
- }
-
- abstract public void run( IAction action );
-
- public void selectionChanged( IAction action, ISelection selection )
- {
- }
-
- protected void openWizardDialog( IWorkbenchWizard wizard )
- {
- ISelection selection = window.getSelectionService().getSelection();
-
- if ( selection instanceof IStructuredSelection )
- {
- wizard.init( window.getWorkbench(), (IStructuredSelection) selection );
- }
- else
- {
- wizard.init( window.getWorkbench(), StructuredSelection.EMPTY );
- }
-
- Shell parent = window.getShell();
- WizardDialog dialog = new WizardDialog( parent, wizard );
-
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenCSSWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenCSSWizardAction.java
deleted file mode 100644
index 2527044..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenCSSWizardAction.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard;
-
-public class OpenCSSWizardAction extends AbstractOpenWizardAction
-{
-
- @Override
- public void run( IAction action )
- {
- openWizardDialog( new NewCSSWizard() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenHTMLWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenHTMLWizardAction.java
deleted file mode 100644
index b009c15..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenHTMLWizardAction.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard;
-
-public class OpenHTMLWizardAction extends AbstractOpenWizardAction
-{
-
- @Override
- public void run( IAction action )
- {
- openWizardDialog( new NewHTMLWizard() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenJSWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenJSWizardAction.java
deleted file mode 100644
index 0e4bb24..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenJSWizardAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-
-public class OpenJSWizardAction extends AbstractOpenWizardAction
-{
-
- @Override
- public void run( IAction action )
- {
- openWizardDialog( new org.eclipse.wst.jsdt.internal.ui.wizards.NewJSWizard() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java
deleted file mode 100644
index 4aa87c5..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java
+++ /dev/null
@@ -1,698 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2011 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WorkingSetGroup;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-import org.eclipse.wst.common.frameworks.internal.ui.NewProjectGroup;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IPreset;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.common.project.facet.core.events.IProjectFacetsChangedEvent;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.common.project.facet.core.util.AbstractFilter;
-import org.eclipse.wst.common.project.facet.core.util.FilterEvent;
-import org.eclipse.wst.common.project.facet.core.util.IFilter;
-import org.eclipse.wst.common.project.facet.ui.ModifyFacetedProjectWizard;
-import org.eclipse.wst.common.project.facet.ui.PresetSelectionPanel;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.facet.RuntimePresetMappingRegistry;
-
-public class DataModelFacetCreationWizardPage extends DataModelWizardPage implements IFacetProjectCreationDataModelProperties {
-
- private static final String NULL_RUNTIME = "NULL_RUNTIME"; //$NON-NLS-1$
- private static final String MRU_RUNTIME_STORE = "MRU_RUNTIME_STORE"; //$NON-NLS-1$
-
- protected static final String RESOURCE_WORKING_SET = "org.eclipse.ui.resourceWorkingSetPage"; //$NON-NLS-1$
- protected static final String JAVA_WORKING_SET = "org.eclipse.jdt.ui.JavaWorkingSetPage"; //$NON-NLS-1$
-
- protected IProjectFacet primaryProjectFacet = null;
- protected Combo primaryVersionCombo = null;
-
- protected WorkingSetGroup workingSetGroup;
-
- private List<IFacetedProjectListener> facetedProjectListeners = new ArrayList<IFacetedProjectListener>();
-
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- final Set<IProjectFacetVersion> config = new HashSet<IProjectFacetVersion>();
-
- for( IProjectFacet fixedFacet : this.fpjwc.getFixedProjectFacets() )
- {
- if( fixedFacet == primaryFacetVersion.getProjectFacet() )
- {
- config.add( primaryFacetVersion );
- }
- else
- {
- config.add( this.fpjwc.getHighestAvailableVersion( fixedFacet ) );
- }
- }
-
- return config;
- }
-
- private static final String[] VALIDATION_PROPERTIES =
- {
- IProjectCreationPropertiesNew.PROJECT_NAME,
- IProjectCreationPropertiesNew.PROJECT_LOCATION,
- FACET_RUNTIME,
- FACETED_PROJECT_WORKING_COPY
- };
-
- protected static GridData gdhfill() {
- return new GridData(GridData.FILL_HORIZONTAL);
- }
-
- protected static GridData hspan( final GridData gd,
- final int span )
- {
- gd.horizontalSpan = span;
- return gd;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite top = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(top, getInfopopID());
- top.setLayout(new GridLayout());
- top.setLayoutData(new GridData(GridData.FILL_BOTH));
- createProjectGroup(top);
- createServerTargetComposite(top);
- createPrimaryFacetComposite(top);
- createPresetPanel(top);
- return top;
- }
-
- private String getPrimaryFacetCompositeLabel()
- {
- final StringBuilder buf = new StringBuilder();
- boolean firstWord = true;
-
- for( String word : primaryProjectFacet.getLabel().split( " " ) ) //$NON-NLS-1$
- {
- if( firstWord )
- {
- buf.append( word );
- firstWord = false;
- }
- else
- {
- buf.append( ' ' );
-
- if( word.length() == 1 || ! Character.isUpperCase( word.charAt( 1 ) ) )
- {
- buf.append( Character.toLowerCase( word.charAt( 0 ) ) );
- buf.append( word.substring( 1 ) );
- }
- else
- {
- buf.append( word );
- }
- }
- }
-
- buf.append( ' ' );
- buf.append( Messages.FACET_VERSION );
-
- return buf.toString();
- }
-
- protected void createPrimaryFacetComposite(Composite top) {
- primaryProjectFacet = ProjectFacetsManager.getProjectFacet( getModuleTypeID() );
- if (primaryProjectFacet.getVersions().size() <= 1){
- //there is no need to create this section if there is only one
- //facet version to choose from (e.g. utility and static web)
- return;
- }
-
- final Group group = new Group( top, SWT.NONE );
- group.setLayoutData( gdhfill() );
- group.setLayout( new GridLayout( 1, false ) );
- group.setText( getPrimaryFacetCompositeLabel() );
-
- primaryVersionCombo = new Combo( group, SWT.BORDER | SWT.READ_ONLY );
- primaryVersionCombo.setLayoutData( gdhfill() );
- updatePrimaryVersions();
-
- primaryVersionCombo.addSelectionListener
- (
- new SelectionAdapter()
- {
- @Override
- public void widgetSelected( final SelectionEvent e )
- {
- handlePrimaryFacetVersionSelectedEvent();
- }
- }
- );
-
- IFacetedProjectListener fpjwcListenerForPrimaryFacetCombo = new IFacetedProjectListener() {
- public void handleEvent(IFacetedProjectEvent event) {
- if(event.getType() == IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED){
- //this block is to update the combo when the underlying facet version changes
- IProjectFacetsChangedEvent actionEvent = (IProjectFacetsChangedEvent)event;
- Set<IProjectFacetVersion> changedVersions = actionEvent.getFacetsWithChangedVersions();
-
- boolean foundComboVersion = false;
- for(Iterator <IProjectFacetVersion> iterator = changedVersions.iterator(); iterator.hasNext() && !foundComboVersion;){
- IProjectFacetVersion next = iterator.next();
- if(next.getProjectFacet().equals(primaryProjectFacet)){
- foundComboVersion = true;
- final IProjectFacetVersion selectedVersion = next;
- Display.getDefault().asyncExec(new Runnable(){
- public void run() {
- String selectedText = primaryVersionCombo.getItem(primaryVersionCombo.getSelectionIndex());
- if(!selectedText.equals(selectedVersion.getVersionString())){
- String [] items = primaryVersionCombo.getItems();
- int selectedVersionIndex = -1;
- for(int i=0;i<items.length && selectedVersionIndex == -1; i++){
- if(items[i].equals(selectedVersion.getVersionString())){
- selectedVersionIndex = i;
- primaryVersionCombo.select(selectedVersionIndex);
- }
- }
- }
- }
- });
- }
- }
- } else if(event.getType() == IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED){
- //this block updates the items in the combo when the runtime changes
- Display.getDefault().asyncExec(new Runnable(){
- public void run() {
- updatePrimaryVersions();
- }
- });
- }
- }
-
- };
- this.facetedProjectListeners.add(fpjwcListenerForPrimaryFacetCombo);
- fpjwc.addListener(fpjwcListenerForPrimaryFacetCombo, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED, IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED);
- }
-
- protected IProjectFacet getPrimaryFacet()
- {
- return this.primaryProjectFacet;
- }
-
- public IProjectFacetVersion getPrimaryFacetVersion()
- {
- IProjectFacetVersion fv = null;
-
- if( this.primaryProjectFacet.getVersions().size() > 1 )
- {
- final int selectedIndex = this.primaryVersionCombo.getSelectionIndex();
-
- if( selectedIndex != -1 )
- {
- final String fvstr = this.primaryVersionCombo.getItem( selectedIndex );
- fv = this.primaryProjectFacet.getVersion( fvstr );
- }
- }
- else
- {
- fv = this.primaryProjectFacet.getDefaultVersion();
- }
-
- return fv;
- }
-
- protected void handlePrimaryFacetVersionSelectedEvent()
- {
- final IProjectFacetVersion fv = getPrimaryFacetVersion();
- if( fv != null )
- {
- String presetID = null;
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- if(runtime != null){
- if(runtime.getRuntimeComponents().size() > 0){
- IRuntimeComponent runtimeComponent = runtime.getRuntimeComponents().get(0);
- String facetRuntimeTypeID = runtimeComponent.getRuntimeComponentType().getId();
- String facetRuntimeVersion = runtimeComponent.getRuntimeComponentVersion().getVersionString();
- String facetID = fv.getProjectFacet().getId();
- String facetVersion = fv.getVersionString();
- presetID = RuntimePresetMappingRegistry.INSTANCE.getPresetID(facetRuntimeTypeID, facetRuntimeVersion, facetID, facetVersion);
- }
- }
-
- if( presetID == null )
- {
- final Set<IProjectFacetVersion> facets = getFacetConfiguration( fv );
- this.fpjwc.setProjectFacets( facets );
- }
- else
- { // setting the facets prior to setting the preset is to let the dynamic presets adjust
- final Set<IProjectFacetVersion> facets = getFacetConfiguration( fv );
- this.fpjwc.setProjectFacets( facets );
- this.fpjwc.setSelectedPreset(presetID);
-
- }
- }
- }
-
- protected void updatePrimaryVersions(){
- IProjectFacetVersion selectedVersion = fpjwc.getProjectFacetVersion(primaryProjectFacet);
- SortedSet<IProjectFacetVersion> initialVersions = fpjwc.getAvailableVersions(primaryProjectFacet);
- String [] items = new String[initialVersions.size()];
- int i=0;
- int selectedVersionIndex = -1;
- for(Iterator <IProjectFacetVersion> iterator = initialVersions.iterator(); iterator.hasNext(); i++){
- items[i] = iterator.next().getVersionString();
- if(selectedVersionIndex == -1 && items[i].equals(selectedVersion.getVersionString())){
- selectedVersionIndex = i;
- }
- }
- primaryVersionCombo.clearSelection();
- primaryVersionCombo.setItems(items);
- primaryVersionCombo.select(selectedVersionIndex);
- }
-
- public static class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.wst.web.ui.internal.wizards.facetcreationpagemessages"; //$NON-NLS-1$
-
- public static String FACET_VERSION;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
- }
-
- protected void createPresetPanel(Composite top) {
- final IFacetedProjectWorkingCopy fpjwc
- = ( (ModifyFacetedProjectWizard) getWizard() ).getFacetedProjectWorkingCopy();
-
- final IFilter<IPreset> filter = new AbstractFilter<IPreset>()
- {
- {
- IFacetedProjectListener fpjwcListenerForPreset = new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- handleProjectFacetsChangedEvent( (IProjectFacetsChangedEvent) event );
- }
- };
- facetedProjectListeners.add(fpjwcListenerForPreset);
- fpjwc.addListener(fpjwcListenerForPreset, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED );
- }
-
- public boolean check( final IPreset preset )
- {
- final IProjectFacetVersion primaryFacetVersion = getPrimaryFacetVersion();
- return preset.getProjectFacets().contains( primaryFacetVersion );
- }
-
- private void handleProjectFacetsChangedEvent( final IProjectFacetsChangedEvent event )
- {
- for( IProjectFacetVersion fv : event.getFacetsWithChangedVersions() )
- {
- if( fv.getProjectFacet() == getPrimaryFacet() )
- {
- final IFilterEvent<IPreset> filterEvent
- = new FilterEvent<IPreset>( this, IFilterEvent.Type.FILTER_CHANGED );
-
- notifyListeners( filterEvent );
- }
- }
- }
- };
-
- final PresetSelectionPanel ppanel = new PresetSelectionPanel( top, fpjwc, filter );
-
- ppanel.setLayoutData( gdhfill() );
- }
-
- public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
- return launchNewRuntimeWizard(shell, model, null);
- }
-
- public static boolean launchNewRuntimeWizard(Shell shell, final IDataModel model, String serverTypeID)
- {
- if( model == null )
- {
- return false;
- }
-
- final DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(FACET_RUNTIME);
-
- final boolean[] keepWaiting = { true };
-
- final IDataModelListener listener = new IDataModelListener()
- {
- public void propertyChanged( final DataModelEvent event )
- {
- if( event.getPropertyName().equals( FACET_RUNTIME ) &&
- event.getFlag() == DataModelEvent.VALID_VALUES_CHG )
- {
- synchronized( keepWaiting )
- {
- keepWaiting[ 0 ] = false;
- keepWaiting.notify();
- }
-
- model.removeListener( this );
- }
- }
- };
-
- model.addListener( listener );
-
- boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, serverTypeID, null);
-
- if( isOK )
- {
- // Do the rest of the processing in a separate thread. Since we are going to block
- // and wait, doing this on the UI thread can cause hangs.
-
- final Thread newRuntimeSelectionThread = new Thread()
- {
- @Override
- public void run()
- {
- // Causes the list of runtimes held by the RuntimeManager to be refreshed and
- // triggers events to listeners on that list.
-
- RuntimeManager.getRuntimes();
-
- // Wait until the list of valid values has updated to include the new runtime.
-
- synchronized( keepWaiting )
- {
- while( keepWaiting[ 0 ] == true )
- {
- try
- {
- keepWaiting.wait();
- }
- catch( InterruptedException e ) {}
- }
- }
-
- // Select the new runtime.
-
- DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(FACET_RUNTIME);
- Object[] preAddition = new Object[preAdditionDescriptors.length];
- for (int i = 0; i < preAddition.length; i++) {
- preAddition[i] = preAdditionDescriptors[i].getPropertyValue();
- }
- Object[] postAddition = new Object[postAdditionDescriptors.length];
- for (int i = 0; i < postAddition.length; i++) {
- postAddition[i] = postAdditionDescriptors[i].getPropertyValue();
- }
- Object newAddition = getNewObject(preAddition, postAddition);
-
- if (newAddition != null) // can this ever be null?
- model.setProperty(FACET_RUNTIME, newAddition);
- }
- };
-
- newRuntimeSelectionThread.start();
-
- return true;
- }
- model.removeListener( listener );
- return false;
- }
-
- public boolean internalLaunchNewRuntimeWizard(Shell shell, IDataModel model) {
- return launchNewRuntimeWizard(shell, model, getModuleTypeID());
- }
-
- protected String getModuleTypeID() {
- return null;
- }
-
- protected Combo serverTargetCombo;
- protected NewProjectGroup projectNameGroup;
- private final IFacetedProjectWorkingCopy fpjwc;
- private final IFacetedProjectListener fpjwcListener;
-
- public DataModelFacetCreationWizardPage(IDataModel dataModel, String pageName)
- {
- super(dataModel, pageName);
-
- this.fpjwc = (IFacetedProjectWorkingCopy) this.model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- this.fpjwcListener = new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- validatePage();
- }
- };
-
- getContainer().getShell().getDisplay().asyncExec( runnable );
- }
- };
-
- this.fpjwc.addListener( this.fpjwcListener, IFacetedProjectEvent.Type.VALIDATION_PROBLEMS_CHANGED );
- }
-
- protected void createServerTargetComposite(Composite parent) {
- Group group = new Group(parent, SWT.NONE);
- group.setText(ResourceHandler.TargetRuntime);
- group.setLayoutData(gdhfill());
- group.setLayout(new GridLayout(2, false));
- serverTargetCombo = new Combo(group, SWT.BORDER | SWT.READ_ONLY);
- serverTargetCombo.setLayoutData(gdhfill());
- Button newServerTargetButton = new Button(group, SWT.NONE);
- newServerTargetButton.setText(Resources.newRuntimeButton);
- GridDataFactory.defaultsFor(newServerTargetButton).applyTo(newServerTargetButton);
- newServerTargetButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (!internalLaunchNewRuntimeWizard(getShell(), model)) {
- //Bugzilla 135288
- //setErrorMessage(ResourceHandler.InvalidServerTarget);
- }
- }
- });
- Control[] deps = new Control[]{newServerTargetButton};
- synchHelper.synchCombo(serverTargetCombo, FACET_RUNTIME, deps);
- if (serverTargetCombo.getSelectionIndex() == -1 && serverTargetCombo.getVisibleItemCount() != 0)
- serverTargetCombo.select(0);
- }
-
- protected void createProjectGroup(Composite parent) {
- IDataModel nestedProjectDM = model.getNestedModel(NESTED_PROJECT_DM);
- nestedProjectDM.addListener(this);
- projectNameGroup = new NewProjectGroup(parent, nestedProjectDM);
- }
-
- @Override
- protected String[] getValidationPropertyNames()
- {
- return VALIDATION_PROPERTIES;
- }
-
- @Override
- public void dispose() {
- super.dispose();
- if (projectNameGroup != null)
- projectNameGroup.dispose();
-
- this.fpjwc.removeListener( this.fpjwcListener );
- for (IFacetedProjectListener listener:this.facetedProjectListeners){
- fpjwc.removeListener(listener);
- }
- model = null;
-
- }
-
- @Override
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- DataModelFacetCreationWizardPage.saveRuntimeSettings(settings, model);
- }
-
- @Override
- public void restoreDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- DataModelFacetCreationWizardPage.restoreRuntimeSettings(settings, model);
- }
-
- public static void saveRuntimeSettings(IDialogSettings settings, IDataModel model){
- if (settings != null) {
- String[] mruRuntimeArray = settings.getArray(MRU_RUNTIME_STORE);
- List mruRuntimes = new ArrayList();
- if(mruRuntimeArray != null)
- mruRuntimes.addAll(Arrays.asList(mruRuntimeArray));
-
- IRuntime runtime = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- String runtimeName = runtime == null ? NULL_RUNTIME : runtime.getName();
-
- if (mruRuntimes.contains(runtimeName)) {
- mruRuntimes.remove(runtimeName);
- }
- mruRuntimes.add(0, runtimeName);
- while (mruRuntimes.size() > 5) {
- mruRuntimes.remove(5);
- }
- mruRuntimeArray = new String[mruRuntimes.size()];
- for (int i = 0; i < mruRuntimeArray.length; i++) {
- mruRuntimeArray[i] = (String) mruRuntimes.get(i);
- }
- settings.put(MRU_RUNTIME_STORE, mruRuntimeArray);
- }
- }
-
- public static void restoreRuntimeSettings(IDialogSettings settings, IDataModel model){
- if (settings != null) {
- if (!model.isPropertySet(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)) {
- boolean runtimeSet = false;
- String[] mruRuntimeArray = settings.getArray(MRU_RUNTIME_STORE);
- DataModelPropertyDescriptor[] descriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- List mruRuntimes = new ArrayList();
- if (mruRuntimeArray == null) {
- List defRuntimes = ProductManager.getDefaultRuntimes();
- for (Iterator iter = defRuntimes.iterator(); iter.hasNext();)
- mruRuntimes.add(((IRuntime) iter.next()).getName());
- } else {
- mruRuntimes.addAll(Arrays.asList(mruRuntimeArray));
- }
- if (!mruRuntimes.isEmpty()) {
- for (int i = 0; i < mruRuntimes.size() && !runtimeSet; i++) {
- for (int j = 0; j < descriptors.length-1 && !runtimeSet; j++) {
- if (mruRuntimes.get(i).equals(((IRuntime)descriptors[j].getPropertyValue()).getName())) {
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[j].getPropertyValue());
- runtimeSet = true;
- }
- }
- if(!runtimeSet && mruRuntimes.get(i).equals(NULL_RUNTIME)){
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[descriptors.length -1].getPropertyValue());
- runtimeSet = true;
- }
- }
- }
- if (!runtimeSet && descriptors.length > 0) {
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[0].getPropertyValue());
- }
- }
- }
- }
-
-
- /**
- * Find first newObject that is not in the oldObjects array (using "==").
- *
- * @param oldObjects
- * @param newObjects
- * @return first newObject not found in oldObjects, or <code>null</code> if all found.
- *
- * @since 1.0.0
- */
- private static Object getNewObject(Object[] oldObjects, Object[] newObjects) {
- if (oldObjects != null && newObjects != null && oldObjects.length < newObjects.length) {
- for (int i = 0; i < newObjects.length; i++) {
- boolean found = false;
- Object object = newObjects[i];
- for (int j = 0; j < oldObjects.length; j++) {
- if (oldObjects[j] == object) {
- found = true;
- break;
- }
- }
- if (!found)
- return object;
- }
- }
- if (oldObjects == null && newObjects != null && newObjects.length == 1)
- return newObjects[0];
- return null;
- }
-
- protected WorkingSetGroup createWorkingSetGroup(Composite composite,
- IStructuredSelection selection, String[] supportedWorkingSetTypes) {
- if (workingSetGroup != null)
- return workingSetGroup;
- workingSetGroup = new WorkingSetGroup(composite, selection,
- supportedWorkingSetTypes);
- return workingSetGroup;
- }
-
- protected WorkingSetGroup createWorkingSetGroupPanel(Composite composite, String[] workingSetTypes) {
- IStructuredSelection structuredSelection = null;
- ISelection currentSelection = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getSelectionService()
- .getSelection();
- if (currentSelection instanceof IStructuredSelection) {
- structuredSelection = (IStructuredSelection) currentSelection;
- }
- WorkingSetGroup group = createWorkingSetGroup(composite, structuredSelection, workingSetTypes);
- return group;
- }
-
- public IWorkingSet[] getSelectedWorkingSets() {
- return workingSetGroup == null ? new IWorkingSet[0] : workingSetGroup
- .getSelectedWorkingSets();
- }
-
- private static final class Resources extends NLS
- {
- public static String newRuntimeButton;
-
- static
- {
- initializeMessages( DataModelFacetCreationWizardPage.class.getName(), Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.properties b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.properties
deleted file mode 100644
index 8f54320..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.properties
+++ /dev/null
@@ -1 +0,0 @@
-newRuntimeButton = New &Runtime...
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java
deleted file mode 100644
index da031f5..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IWizardContext;
-
-public abstract class DataModelFacetInstallPage extends DataModelWizardPage implements IFacetWizardPage, IFacetInstallDataModelProperties {
-
- public DataModelFacetInstallPage(String pageName) {
- // TODO figure out a better way to do this without compromising the IDataModelWizard
- // framework.
- super(DataModelFactory.createDataModel(new AbstractDataModelProvider() {
- }), pageName);
- }
-
- protected static GridData gdhfill() {
- return new GridData(GridData.FILL_HORIZONTAL);
- }
-
- public void setWizardContext(IWizardContext context) {
- // Intentionally empty
- }
-
- public void transferStateToConfig() {
- // Intentionally empty
- }
-
- public void setConfig(final Object config) {
- model.removeListener(this);
- synchHelper.dispose();
-
- model = (IDataModel) config;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java
deleted file mode 100644
index 565a9f3..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-public interface IWstWebUIContextIds {
-
- public static final String PLUGIN_WST_WEB_UI = "org.eclipse.wst.web.ui."; //$NON-NLS-1$
-
- public static final String NEW_STATIC_WEB_PROJECT_PAGE1 = PLUGIN_WST_WEB_UI + "webw2000"; //$NON-NLS-1$
- public static final String NEW_STATIC_WEB_PROJECT_PAGE2 = PLUGIN_WST_WEB_UI + "webw2100"; //$NON-NLS-1$
- public static final String NEW_STATIC_WEB_PROJECT_PAGE3 = PLUGIN_WST_WEB_UI + "webw2200"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
deleted file mode 100644
index 6f30a45..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-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.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelPausibleOperationImpl;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IPreset;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.ui.ModifyFacetedProjectWizard;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-import org.eclipse.wst.web.ui.internal.Logger;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public abstract class NewProjectDataModelFacetWizard extends ModifyFacetedProjectWizard implements INewWizard, IFacetProjectCreationDataModelProperties {
-
- protected IDataModel model = null;
- protected IFacetedProjectTemplate template;
- private IWizardPage[] beginingPages;
- private IConfigurationElement configurationElement;
-
- public NewProjectDataModelFacetWizard(IDataModel model)
- {
- this.model = ( model == null ? createDataModel() : model );
- this.template = getTemplate();
-
- setFacetedProjectWorkingCopy((IFacetedProjectWorkingCopy)this.model.getProperty(FACETED_PROJECT_WORKING_COPY));
- getFacetedProjectWorkingCopy().setFixedProjectFacets( this.template.getFixedProjectFacets() );
- setDefaultPageImageDescriptor(getDefaultPageImageDescriptor());
- setShowFacetsSelectionPage( false );
- }
-
- public NewProjectDataModelFacetWizard()
- {
- this( null );
- }
-
- public IDataModel getDataModel() {
- return model;
- }
-
- protected abstract IDataModel createDataModel();
-
- protected abstract ImageDescriptor getDefaultPageImageDescriptor();
-
- protected abstract IFacetedProjectTemplate getTemplate();
-
- /**
- * Returns the first page that shows up before the facets page. If multiple pages are required,
- * also override {@link #createBeginingPages()}.
- *
- * @return
- */
- protected abstract IWizardPage createFirstPage();
-
- /**
- * Subclasses should override to add more than one page before the facets page. If only one page
- * is required, then use {@link #createFirstPage()}. The default implementation will return the
- * result of {@link #createFirstPage()}.
- *
- * @return
- */
- protected IWizardPage[] createBeginingPages() {
- return new IWizardPage[]{createFirstPage()};
- }
-
- @Override
- public void addPages() {
- beginingPages = createBeginingPages();
- for (int i = 0; i < beginingPages.length; i++) {
- addPage(beginingPages[i]);
- }
-
- super.addPages();
-
- getFacetedProjectWorkingCopy().addListener
- (
- new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- facetSelectionChangedEvent();
- }
- },
- IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED
- );
- }
-
- @Override
- public void createPageControls(Composite container) {
- super.createPageControls(container);
-
- final IPreset preset = this.template.getInitialPreset();
- final IRuntime runtime = (IRuntime) model.getProperty( FACET_RUNTIME );
-
- if( preset == null )
- {
- // If no preset is specified, select the runtime and it's default
- // facets.
-
- setRuntimeAndDefaultFacets( runtime );
- }
- else
- {
- // If preset is specified, select the runtime only if supports all
- // of the facets included in the preset.
-
- getFacetedProjectWorkingCopy().setSelectedPreset( preset.getId() );
-
- boolean supports = false;
-
- if( runtime != null )
- {
- supports = true;
-
- for( Iterator itr = preset.getProjectFacets().iterator(); itr.hasNext(); )
- {
- final IProjectFacetVersion fv = (IProjectFacetVersion) itr.next();
-
- if( ! runtime.supports( fv ) )
- {
- supports = false;
- break;
- }
- }
- }
-
- if( supports )
- {
- getFacetedProjectWorkingCopy().setTargetedRuntimes( Collections.singleton( runtime ) );
- }
- else
- {
- model.setProperty( FACET_RUNTIME, null );
- }
- }
-
- synchRuntimes();
- }
-
- @Override
- public IWizardPage[] getPages() {
- final IWizardPage[] base = super.getPages();
- final IWizardPage[] pages = new IWizardPage[base.length + beginingPages.length];
-
- for (int i = 0; i < beginingPages.length; i++) {
- pages[i] = beginingPages[i];
- }
-
- System.arraycopy(base, 0, pages, beginingPages.length, base.length);
-
- return pages;
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- }
-
- protected void synchRuntimes()
- {
- final Boolean[] suppressBackEvents = { Boolean.FALSE };
-
- model.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IDataModel.VALUE_CHG == event.getFlag() || IDataModel.DEFAULT_CHG == event.getFlag()) {
- if (FACET_RUNTIME.equals(event.getPropertyName())) {
- if( ! suppressBackEvents[ 0 ].booleanValue() ) {
- IRuntime runtime = (IRuntime) event.getProperty();
- setRuntimeAndDefaultFacets( runtime );
- }
- }
- }
- }
- });
-
- getFacetedProjectWorkingCopy().addListener
- (
- new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- suppressBackEvents[ 0 ] = Boolean.TRUE;
- model.setProperty(FACET_RUNTIME, getFacetedProjectWorkingCopy().getPrimaryRuntime());
- suppressBackEvents[ 0 ] = Boolean.FALSE;
- }
- },
- IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED
- );
- }
-
- protected void setRuntimeAndDefaultFacets( final IRuntime runtime )
- {
- final IFacetedProjectWorkingCopy dm = getFacetedProjectWorkingCopy();
-
- dm.setTargetedRuntimes( Collections.<IRuntime>emptySet() );
-
- if( runtime != null )
- {
- final Set<IProjectFacetVersion> minFacets = new HashSet<IProjectFacetVersion>();
-
- try
- {
- for( IProjectFacet f : dm.getFixedProjectFacets() )
- {
- minFacets.add( f.getLatestSupportedVersion( runtime ) );
- }
- }
- catch( CoreException e )
- {
- throw new RuntimeException( e );
- }
-
- dm.setProjectFacets( minFacets );
-
- dm.setTargetedRuntimes( Collections.singleton( runtime ) );
- }
-
- dm.setSelectedPreset( FacetedProjectFramework.DEFAULT_CONFIGURATION_PRESET_ID );
- }
-
- public String getProjectName() {
- return model.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
- }
-
- @Override
- protected void performFinish(final IProgressMonitor monitor)
-
- throws CoreException
-
- {
- monitor.beginTask("", 10); //$NON-NLS-1$
- storeDefaultSettings();
- try {
- super.performFinish(new SubProgressMonitor(monitor, 8));
-
- try {
- getFacetProjectNotificationOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- String msg = e.getMessage();
- if( msg == null ) msg = ""; //$NON-NLS-1$
- final IStatus st = new Status( IStatus.ERROR, WSTWebUIPlugin.PLUGIN_ID, 0, msg, e );
- throw new CoreException( st );
- }
- } finally {
- monitor.done();
- }
- }
-
- @Override
- public boolean performFinish() {
- if (super.performFinish() == false) {
- return false;
- }
-
- try {
- postPerformFinish();
- } catch (InvocationTargetException e) {
- Logger.logException(e);
- }
-
- return true;
- }
-
- /**
- * <p>
- * Override to return the final perspective ID (if any). The final perspective ID can be
- * hardcoded by the subclass or determined programmatically (possibly using the value of a field
- * on the Wizard's WTP Operation Data Model).
- * </p>
- * <p>
- * The default implementation returns no perspective id unless overriden by product definition
- * via the "wtp.project.final.perspective" property.
- * </p>
- *
- * @return Returns the ID of the Perspective which is preferred by this wizard upon completion.
- */
-
- protected String getFinalPerspectiveID() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * The configuration element is saved to use when the wizard completes in order to change the
- * current perspective using either (1) the value specified by {@link #getFinalPerspectiveID()}
- * or (2) the value specified by the finalPerspective attribute in the Wizard's configuration
- * element.
- * </p>
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public final void setInitializationData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) throws CoreException {
- configurationElement = aConfigurationElement;
- doSetInitializeData(aConfigurationElement, aPropertyName, theData);
-
- }
-
- /**
- * <p>
- * Override method for clients that wish to take advantage of the information provided by
- * {@see #setInitializationData(IConfigurationElement, String, Object)}.
- * </p>
- *
- * @param aConfigurationElement
- * The configuration element provided from the templated method.
- * @param aPropertyName
- * The property name provided from the templated method.
- * @param theData
- * The data provided from the templated method.
- */
- protected void doSetInitializeData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) {
- // Default do nothing
- }
-
- /**
- * <p>
- * Returns the an id component used for Activity filtering.
- * </p>
- *
- * <p>
- * The Plugin ID is determined from the configuration element specified in
- * {@see #setInitializationData(IConfigurationElement, String, Object)}.
- * </p>
- *
- * @return Returns the plugin id associated with this wizard
- */
- public final String getPluginId() {
- return (configurationElement != null) ? configurationElement.getDeclaringExtension().getNamespace() : ""; //$NON-NLS-1$
- }
-
- /**
- *
- * <p>
- * Invoked after the user has clicked the "Finish" button of the wizard. The default
- * implementation will attempt to update the final perspective to the value specified by
- * { @link #getFinalPerspectiveID() }
- * </p>
- *
- * @throws InvocationTargetException
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()
- */
- protected void postPerformFinish() throws InvocationTargetException {
- String projName = getProjectName();
- IProject newProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- IWorkbench workbench = WSTWebUIPlugin.getDefault().getWorkbench();
-
- // add to the selected working sets
- if (newProject != null &&
- beginingPages != null &&
- beginingPages.length > 0 &&
- beginingPages[0] instanceof DataModelFacetCreationWizardPage) {
- DataModelFacetCreationWizardPage mainPage = (DataModelFacetCreationWizardPage) beginingPages[0];
- IWorkingSet[] workingSets = mainPage.getSelectedWorkingSets();
- workbench.getWorkingSetManager().addToWorkingSets(newProject, workingSets);
- }
-
- // open the "final" perspective
- if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
- final IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
- @Override
- public String getAttribute(String aName) {
- if (aName.equals("finalPerspective")) { //$NON-NLS-1$
- return getFinalPerspectiveID();
- }
- return super.getAttribute(aName);
- }
- };
- BasicNewProjectResourceWizard.updatePerspective(element);
- } else
- BasicNewProjectResourceWizard.updatePerspective(configurationElement);
-
- // select and reveal
- BasicNewResourceWizard.selectAndReveal(newProject, workbench.getActiveWorkbenchWindow());
- }
-
- protected IDataModelOperation getFacetProjectNotificationOperation() {
- return new DataModelPausibleOperationImpl(new AbstractDataModelOperation(this.model) {
- @Override
- public String getID() {
- return NewProjectDataModelFacetWizard.class.getName();
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return AbstractDataModelProvider.OK_STATUS;
- }
- });
- }
-
- /**
- * Need to keep the model in sync with the UI. This method will pickup changes coming from the
- * UI and push them into the model
- */
- protected void facetSelectionChangedEvent() {
- Set actions = getFacetedProjectWorkingCopy().getProjectFacetActions();
- Iterator iterator = actions.iterator();
- Set activeIds = new HashSet();
- while (iterator.hasNext()) {
- IFacetedProject.Action action = (IFacetedProject.Action) iterator.next();
- String id = action.getProjectFacetVersion().getProjectFacet().getId();
- activeIds.add(id);
- }
- // First handle all the actions tracked by IDataModels
- FacetDataModelMap dataModelMap = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
- iterator = dataModelMap.keySet().iterator();
- while (iterator.hasNext()) {
- String id = (String) iterator.next();
- IDataModel configDM = (IDataModel) dataModelMap.get(id);
- boolean active = activeIds.contains(id);
- configDM.setBooleanProperty(IFacetDataModelProperties.SHOULD_EXECUTE, active);
- activeIds.remove(id);
- }
- // Now handle the actions not tracked by IDataModels
- FacetActionMap actionMap = (FacetActionMap) model.getProperty(FACET_ACTION_MAP);
- actionMap.clear();
- iterator = actions.iterator();
- while (iterator.hasNext()) {
- IFacetedProject.Action action = (IFacetedProject.Action) iterator.next();
- String id = action.getProjectFacetVersion().getProjectFacet().getId();
- if (activeIds.contains(id)) {
- actionMap.add(action);
- }
- }
- model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
- }
-
- protected void storeDefaultSettings() {
- IWizardPage[] pages = getPages();
- for (int i = 0; i < pages.length; i++)
- storeDefaultSettings(pages[i], i);
- }
-
- /**
- * Subclasses may override if they need to do something special when storing the default
- * settings for a particular page.
- *
- * @param page
- * @param pageIndex
- */
- protected void storeDefaultSettings(IWizardPage page, int pageIndex) {
- if (page instanceof DataModelWizardPage)
- ((DataModelWizardPage) page).storeDefaultSettings();
- }
-
- @Override
- public void dispose() {
- if(this.model != null){
- this.model.dispose();
- }
- super.dispose();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java
deleted file mode 100644
index f4e9286..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-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.Text;
-import org.eclipse.wst.project.facet.ISimpleWebFacetInstallDataModelProperties;
-import org.eclipse.wst.web.internal.ResourceHandler;
-
-public class SimpleWebFacetInstallPage extends DataModelFacetInstallPage implements ISimpleWebFacetInstallDataModelProperties {
-
- private Label configFolderLabel;
- private Text configFolder;
- private Label contextRootLabel;
- private Text contextRoot;
-
- public SimpleWebFacetInstallPage() {
- super("simpleweb.facet.install.page"); //$NON-NLS-1$
- setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title);
- setDescription(ResourceHandler.ConfigureSettings);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{CONTEXT_ROOT, CONTENT_DIR};
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IWstWebUIContextIds.NEW_STATIC_WEB_PROJECT_PAGE3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- this.contextRootLabel = new Label(composite, SWT.NONE);
- this.contextRootLabel.setText(ResourceHandler.StaticContextRootComposite_Context_Root_Label);
- this.contextRootLabel.setLayoutData(gdhfill());
-
- this.contextRoot = new Text(composite, SWT.BORDER);
- this.contextRoot.setLayoutData(gdhfill());
- this.contextRoot.setData("label", this.contextRootLabel); //$NON-NLS-1$
- synchHelper.synchText(contextRoot, CONTEXT_ROOT, new Control[]{contextRootLabel});
-
- configFolderLabel = new Label(composite, SWT.NONE);
- configFolderLabel.setText(ResourceHandler.StaticWebSettingsPropertiesPage_Web_Content_Label);
- configFolderLabel.setLayoutData(gdhfill());
-
- configFolder = new Text(composite, SWT.BORDER);
- configFolder.setLayoutData(gdhfill());
- configFolder.setData("label", configFolderLabel); //$NON-NLS-1$
- synchHelper.synchText(configFolder, CONTENT_DIR, null);
- Dialog.applyDialogFont(parent);
-
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java
deleted file mode 100644
index ec05607..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public class SimpleWebProjectFirstPage extends DataModelFacetCreationWizardPage {
-
- public SimpleWebProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setDescription(ResourceHandler.StaticWebProjectWizardBasePage_Page_Description);
- setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title);
- setImageDescriptor(WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz")); //$NON-NLS-1$
- setInfopopID(IWstWebUIContextIds.NEW_STATIC_WEB_PROJECT_PAGE1);
- }
-
- @Override
- protected String getModuleTypeID() {
- return IModuleConstants.WST_WEB_MODULE;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- final Composite top = super.createTopLevelComposite(parent);
- createWorkingSetGroupPanel(top, new String[] { RESOURCE_WORKING_SET });
- return top;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java
deleted file mode 100644
index 8749672..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.project.facet.SimpleWebFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public class SimpleWebProjectWizard extends NewProjectDataModelFacetWizard {
-
- public SimpleWebProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title);
- }
-
- public SimpleWebProjectWizard() {
- super();
- setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title);
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- return WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz"); //$NON-NLS-1$
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.wst.web"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new SimpleWebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_STATICWEB);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/facetcreationpagemessages.properties b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/facetcreationpagemessages.properties
deleted file mode 100644
index 08afb68..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/facetcreationpagemessages.properties
+++ /dev/null
@@ -1 +0,0 @@
-FACET_VERSION= &version
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/.classpath b/plugins/org.eclipse.wst.web/.classpath
deleted file mode 100644
index 15a90f8..0000000
--- a/plugins/org.eclipse.wst.web/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="static_web_project"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web/.gitignore b/plugins/org.eclipse.wst.web/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/plugins/org.eclipse.wst.web/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/plugins/org.eclipse.wst.web/.project b/plugins/org.eclipse.wst.web/.project
deleted file mode 100644
index fb86548..0000000
--- a/plugins/org.eclipse.wst.web/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web</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.wst.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 51c2889..0000000
--- a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-#Tue Sep 29 10:42:06 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9602203..0000000
--- a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Sep 29 10:42:06 EDT 2009
-org.eclipse.jdt.ui.exception.name=e
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
deleted file mode 100644
index dfdd603..0000000
--- a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.web; singleton:=true
-Bundle-Version: 1.1.900.qualifier
-Bundle-Activator: org.eclipse.wst.web.internal.WSTWebPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.project.facet,
- org.eclipse.wst.web.internal;x-internal:=true,
- org.eclipse.wst.web.internal.deployables;x-internal:=true,
- org.eclipse.wst.web.internal.facet,
- org.eclipse.wst.web.internal.operation;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.web/about.html b/plugins/org.eclipse.wst.web/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.web/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.web/build.properties b/plugins/org.eclipse.wst.web/build.properties
deleted file mode 100644
index 182b94a..0000000
--- a/plugins/org.eclipse.wst.web/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html,\
- .
-jars.compile.order = .
-src.includes = component.xml
-output.. = bin/
-source.. = static_web_project/,\
- property_files/
diff --git a/plugins/org.eclipse.wst.web/component.xml b/plugins/org.eclipse.wst.web/component.xml
deleted file mode 100644
index 89207cb..0000000
--- a/plugins/org.eclipse.wst.web/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.web"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.web" fragment="false"/><plugin id="org.eclipse.wst.web.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
deleted file mode 100644
index 1edd090..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/plugin.properties b/plugins/org.eclipse.wst.web/plugin.properties
deleted file mode 100644
index d686a74..0000000
--- a/plugins/org.eclipse.wst.web/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
-
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = Simple Web Plug-in
-
-SIMPLE_WEB_LABEL=Static Web Module
-SIMPLE_WEB_DESCRIPTION=Enables the project to be deployed as a static web module.
-SIMPLE_WEB_TEMPLATE=Static Web Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/plugin.xml b/plugins/org.eclipse.wst.web/plugin.xml
deleted file mode 100644
index 0fd8b4d..0000000
--- a/plugins/org.eclipse.wst.web/plugin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="runtimePresetMappings" name="Runtime Preset Mappings Extension" schema="schema/runtimePresetMappings.exsd"/>
- <extension
- point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- projects="true"
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableFactory"
- id="org.eclipse.wst.web.internal.deployables.static">
- <moduleType
- versions="1.0, 1.2, 1.3, 1.4"
- types="wst.web">
- </moduleType>
- </moduleFactory>
- </extension>
-
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webstatic1"
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="wst.web" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webstatic2"
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="wst.web" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type="org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact"/>
- </factory>
- </extension>
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="wst.web.builder"
- providerID="org.eclipse.wst.common.componentcore.internal.builder.WorkbenchComponentBuilderDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"
- id="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"/>
- </extension>
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="wst.web">
- <label>%SIMPLE_WEB_LABEL</label>
- <description>%SIMPLE_WEB_DESCRIPTION</description>
- <property name="hide.version" value="true"/>
- </project-facet>
-
- <project-facet-version facet="wst.web" version="1.0">
- <action type="install" id="wst.web.install">
- <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDelegate"/>
- <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
- </action>
- <action type="uninstall" id="wst.web.uninstall">
- <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetUninstallDelegate"/>
- <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
- </action>
- <constraint>
- <conflicts group="modules"/>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <template id="template.wst.web">
- <label>%SIMPLE_WEB_TEMPLATE</label>
- <fixed facet="wst.web"/>
- </template>
-
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.wst.web/pom.xml b/plugins/org.eclipse.wst.web/pom.xml
deleted file mode 100644
index bd19e55..0000000
--- a/plugins/org.eclipse.wst.web/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
--->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.webtools.javaee</groupId>
- <artifactId>javaee.plugins</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.eclipse.webtools.javaee</groupId>
- <artifactId>org.eclipse.wst.web</artifactId>
- <version>1.1.900-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties b/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
deleted file mode 100644
index c3c3687..0000000
--- a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-StaticWebProjectCreationWizard_Wizard_Title=New Static Web Project
-StaticWebProjectWizardBasePage_Page_Description=Create a Web project for simple content (HTML files) only.
-StaticWebSettingsPropertiesPage_Web_Content_Label=&Web content folder name:
-StaticContextRootComposite_Context_Root_Label=&Context root:
-StaticWebProjectWizardBasePage_Page_Title=Static Web Project
-StaticWebSettingsPropertiesPage_Not_available_for_closed_projects=Web settings are not available for a closed project.
-TargetRuntime=Target r&untime
-NewDotDotDot=N&ew...
-InvalidServerTarget=Invalid target server selected.
-ConfigureSettings=Configure Static Web module settings.
-Context_Root_cannot_be_empty_2=Context root cannot be empty
-Names_cannot_contain_whitespace=Context root cannot contain whitespace
-The_character_is_invalid_in_a_context_root=The character ''{0}'' is invalid in a context root.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd b/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd
deleted file mode 100644
index 3d27116..0000000
--- a/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.web" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.web" id="RuntimePresetMappings" name="Runtime Preset Mappings Extension"/>
- </appinfo>
- <documentation>
- This extension point allows the configuration of a default facet preset for any Runtime Type ID, Facet ID & Fact Version combination. For example, given runtime type X, facet jst.web, and version 2.4, the preset Y should be selected by default where as given runtime type X, facet jst.web, and version 2.5, the preset Z should be selected by default.
-
-For each of the four facetRuntimeTypeID, facetRuntimeVersion, facetID, facetVersion the following pattern is used to ease the definition process. The pattern specified allows a comma deliminated list of possible values. For example to match only "1.0" the pattern should be "1.0". To match multiple values, say 1.0, 2.0, and 3.0, use "1.0,2.0,3.0". Asterests may be used to specify multiple values. For example, "1.*" will match any values starting with '1.' including 1., 1.0, 1.1, 1.2, but not 1 Likewise, "*.0" will match any values ending with '.0' including 1.0, 2.0, 3.0, but not 1 or 0 Asterists may be added both at the begining and end of a string, so "*00*" will match any string that contains '00' such as 00, 100, 1001.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="mapping" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="mapping">
- <annotation>
- <documentation>
- Each mapping element defineds a mapping from (runtimeid, facetid, facetversion) to presetid.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetRuntimeTypeID" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetRuntimeVersion" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetID" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetVersion" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="presetID" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="implementation"/>
- </appinfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
deleted file mode 100644
index a1dac21..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2012 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
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-/**
- * These constants define the set of properties that this pluging expects to
- * be available via <code>IProduct.getProperty(String)</code>. The status of
- * this interface and the facilities offered is highly provisional.
- * Productization support will be reviewed and possibly modified in future
- * releases.
- * <p>This interface is not intended to be implemented by clients.</p>
- *
- * @noimplement
- *
- * @see org.eclipse.core.runtime.IProduct#getProperty(String)
- */
-
-public interface IProductConstants {
-
- public static final String APPLICATION_CONTENT_FOLDER = "earContent"; //$NON-NLS-1$
- public static final String WEB_CONTENT_FOLDER = "webContent"; //$NON-NLS-1$
- public static final String EJB_CONTENT_FOLDER = "ejbContent"; //$NON-NLS-1$
- public static final String APP_CLIENT_CONTENT_FOLDER = "appClientContent"; //$NON-NLS-1$
- public static final String JCA_CONTENT_FOLDER = "jcaContent"; //$NON-NLS-1$
- public static final String DEFAULT_SOURCE_FOLDER = "defaultSource"; //$NON-NLS-1$
- public static final String ADD_TO_EAR_BY_DEFAULT = "addToEarByDefault"; //$NON-NLS-1$
- public static final String ADD_TO_EAR_RUNTIME_EXCEPTIONS = "addToEARruntimeExceptions"; //$NON-NLS-1$
- public static final String OUTPUT_FOLDER = "outputFolder"; //$NON-NLS-1$
- public static final String USE_SINGLE_ROOT_STRUCTURE = "useSingleRootStructure"; //$NON-NLS-1$
- public static final String ID_PERSPECTIVE_HIERARCHY_VIEW = "idPerspectiveHierarchyView"; //$NON-NLS-1$
- public static final String SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE = "showJavaEEModuleDependencyPage"; //$NON-NLS-1$
- public static final String DYNAMIC_WEB_GENERATE_DD = "dynamic_web_generate_dd"; //$NON-NLS-1$
- public static final String EE6_CONNECTOR_GENERATE_DD = "ee6_connector_generate_dd"; //$NON-NLS-1$
- public static final String EE7_CONNECTOR_GENERATE_DD = "ee7_connector_generate_dd"; //$NON-NLS-1$
- public static final String EJB_BUSINESS_INTERFACE_ANNOTATION_IN_BEAN = "ejb_business_interaface_annotation_in_bean"; //$NON-NLS-1$
- public static final String EJB_BUSINESS_INTERFACE_ANNOTATION_IN_INTERFACE = "ejb_business_interaface_annotation_in_interface"; //$NON-NLS-1$
- public static final String EJB_INTERFACE_PACKAGE_SUFFIX = "ejb_interface_package_suffix"; //$NON-NLS-1$
-
-
- /**
- * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
- */
- public static final String ALLOW_CLASSPATH_DEP = "allowClasspathDep"; //$NON-NLS-1$
- public static final String VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI = "validateDupClasspathCompURI"; //$NON-NLS-1$
-
- public static final String DYN_WEB_OUTPUT_FOLDER = "dynWebOutput"; //$NON-NLS-1$
- public static final String EJB_OUTPUT_FOLDER = "ejbOutput"; //$NON-NLS-1$
- public static final String APP_CLIENT_OUTPUT_FOLDER = "appClientOutput"; //$NON-NLS-1$
- public static final String JCA_OUTPUT_FOLDER = "jcaOutput"; //$NON-NLS-1$
- public static final String UTILITY_OUTPUT_FOLDER ="utilOutput"; //$NON-NLS-1$
-
- /**
- * Alters the final perspective used by the following new project wizards
- */
- public static final String FINAL_PERSPECTIVE_WEB = "finalPerspectiveWeb"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_EJB = "finalPerspectiveEjb"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_EAR = "finalPerspectiveEar"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_APPCLIENT = "finalPerspectiveAppClient"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_JCA = "finalPerspectiveJca"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_UTILITY = "finalPerspectiveUtility"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_STATICWEB = "finalPerspectiveStaticWeb"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_WEBFRAGMENT = "finalPerspectiveWebFragment"; //$NON-NLS-1$
-
- /**
- * Ability to default initial runtimes chosen in wizards
- */
- public static final String DEFAULT_RUNTIME_1 = "defaultRuntime1"; //$NON-NLS-1$
- public static final String DEFAULT_RUNTIME_2 = "defaultRuntime2"; //$NON-NLS-1$
- public static final String DEFAULT_RUNTIME_3 = "defaultRuntime3"; //$NON-NLS-1$
- public static final String DEFAULT_RUNTIME_4 = "defaultRuntime4"; //$NON-NLS-1$
- public static final String VIEWER_SYNC_FOR_WEBSERVICES = "viewerSyncForWebservices"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
deleted file mode 100644
index 2f3263e..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface ISimpleWebFacetInstallDataModelProperties extends IDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = SimpleWebFacetProjectCreationDataModelProvider.class;
-
- public static final String CONTENT_DIR = "IStaticWebFacetInstallDataModelProperties.CONTENT_DIR"; //$NON-NLS-1$
-
- public static final String CONTEXT_ROOT = "IStaticWebFacetInstallDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
deleted file mode 100644
index 9fdbfe9..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2012 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
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class ProductManager {
-
- /**
- * Default values for WTP level product
- */
- private static final String APPLICATION_CONTENT_FOLDER = "EarContent"; //$NON-NLS-1$
- private static final String WEB_CONTENT_FOLDER = "WebContent"; //$NON-NLS-1$
- private static final String EJB_CONTENT_FOLDER = "ejbModule"; //$NON-NLS-1$
- private static final String APP_CLIENT_CONTENT_FOLDER = "appClientModule"; //$NON-NLS-1$
- private static final String JCA_CONTENT_FOLDER = "connectorModule"; //$NON-NLS-1$
- private static final String DEFAULT_SOURCE_FOLDER = "src"; //$NON-NLS-1$
- private static final String ADD_TO_EAR_BY_DEFAULT = "false"; //$NON-NLS-1$
- private static final String ADD_TO_EAR_RUNTIME_EXCEPTIONS = ""; //$NON-NLS-1$
- private static final String OUTPUT_FOLDER = "build/classes"; //$NON-NLS-1$
- private static final String USE_SINGLE_ROOT_STRUCTURE = "false"; //$NON-NLS-1$
- private static final String VIEWER_SYNC_FOR_WEBSERVICES = "true"; //$NON-NLS-1$
- private static final String ID_PERSPECTIVE_HIERARCHY_VIEW = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
- private static final String SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE = "true"; //$NON-NLS-1$
- private static final String FINAL_PERSPECTIVE = "org.eclipse.jst.j2ee.J2EEPerspective"; //$NON-NLS-1$
- private static final String FINAL_WEB_PERSPECTIVE = "org.eclipse.wst.web.ui.webDevPerspective"; //$NON-NLS-1$
- private static final String DYNAMIC_WEB_GENERATE_DD = "true"; //$NON-NLS-1$
- private static final char RUNTIME_SEPARATOR = ':';
- private static final String[] DEFAULT_RUNTIME_KEYS =
- new String[]{IProductConstants.DEFAULT_RUNTIME_1,
- IProductConstants.DEFAULT_RUNTIME_2,
- IProductConstants.DEFAULT_RUNTIME_3,
- IProductConstants.DEFAULT_RUNTIME_4};
-
- /**
- * Return the value for the associated key from the Platform Product registry or return the
- * WTP default for the J2EE cases.
- *
- * @param key
- * @return String value of product's property
- */
- public static String getProperty(String key) {
- if (key == null)
- return null;
- String value = null;
- if (Platform.getProduct()!=null)
- value = Platform.getProduct().getProperty(key);
- if (value == null)
- {
- value = Platform.getPreferencesService().getString(WSTWebPlugin.PLUGIN_ID, key, null, null);
- }
- if (value == null) {
- if (key.equals(IProductConstants.APPLICATION_CONTENT_FOLDER))
- return APPLICATION_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.WEB_CONTENT_FOLDER))
- return WEB_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.EJB_CONTENT_FOLDER))
- return EJB_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.APP_CLIENT_CONTENT_FOLDER))
- return APP_CLIENT_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.JCA_CONTENT_FOLDER))
- return JCA_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.DEFAULT_SOURCE_FOLDER))
- return DEFAULT_SOURCE_FOLDER;
- else if (key.equals(IProductConstants.ADD_TO_EAR_BY_DEFAULT))
- return ADD_TO_EAR_BY_DEFAULT;
- else if (key.equals(IProductConstants.ADD_TO_EAR_RUNTIME_EXCEPTIONS))
- return ADD_TO_EAR_RUNTIME_EXCEPTIONS;
- else if (key.equals(IProductConstants.USE_SINGLE_ROOT_STRUCTURE))
- return USE_SINGLE_ROOT_STRUCTURE;
- else if (key.equals(IProductConstants.VIEWER_SYNC_FOR_WEBSERVICES))
- return VIEWER_SYNC_FOR_WEBSERVICES;
- else if (key.equals(IProductConstants.OUTPUT_FOLDER))
- return OUTPUT_FOLDER;
- else if (key.equals(IProductConstants.ID_PERSPECTIVE_HIERARCHY_VIEW))
- return ID_PERSPECTIVE_HIERARCHY_VIEW;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EAR))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EJB))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_JCA))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_STATICWEB))
- return FINAL_WEB_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_UTILITY))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_WEB))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE))
- return SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE;
- else if (key.equals(IProductConstants.DYNAMIC_WEB_GENERATE_DD))
- return DYNAMIC_WEB_GENERATE_DD;
- else if (key.equals(IProductConstants.EJB_INTERFACE_PACKAGE_SUFFIX))
- return ""; //$NON-NLS-1$
- }
- return value;
- }
-
- public static boolean shouldAddToEARByDefault() {
- String value = getProperty(IProductConstants.ADD_TO_EAR_BY_DEFAULT);
- return Boolean.valueOf(value).booleanValue();
- }
-
- public static boolean shouldUseSingleRootStructure() {
- String value = getProperty(IProductConstants.USE_SINGLE_ROOT_STRUCTURE);
- return Boolean.valueOf(value).booleanValue();
- }
-
- public static boolean shouldUseViewerSyncForWebservices() {
- String value = getProperty(IProductConstants.VIEWER_SYNC_FOR_WEBSERVICES);
- return Boolean.valueOf(value).booleanValue();
- }
-
- public static List/*<IRuntime>*/ getDefaultRuntimes() {
- List theRuntimes = null;
- Set runtimes = RuntimeManager.getRuntimes();
- if (!runtimes.isEmpty()) {
- IRuntime defaultRuntime = null;
- // First check if defaults are defined
- for (int i = 0; i < DEFAULT_RUNTIME_KEYS.length; i++) {
- defaultRuntime = getMatchingRuntime(DEFAULT_RUNTIME_KEYS[i], runtimes);
- if (defaultRuntime != null) {
- if (theRuntimes == null) {
- theRuntimes = new ArrayList(DEFAULT_RUNTIME_KEYS.length);
- }
- theRuntimes.add(defaultRuntime);
- }
- }
- }
- if (theRuntimes == null) {
- theRuntimes = Collections.EMPTY_LIST;
- }
- return theRuntimes;
- }
-
- private static IRuntime getMatchingRuntime(String defaultProductRuntimeProperty, Set runtimes) {
- String defaultProductRuntimeKey = getProperty(defaultProductRuntimeProperty);
- if (defaultProductRuntimeKey == null || defaultProductRuntimeKey.length() == 0) {
- return null;
- }
- //The defaultProductRuntimeKey needs to be in the following format
- //<facet runtime id>:<facet version>.
- int seperatorIndex = defaultProductRuntimeKey.indexOf(RUNTIME_SEPARATOR);
- if (seperatorIndex < 0 && seperatorIndex < defaultProductRuntimeKey.length()) {
- //Consider throwing an exception here.
- WSTWebPlugin.logError("Invalid default product runtime id. It should follow the format <facet runtime id>:<facet version>. Id processed: " + defaultProductRuntimeKey); //$NON-NLS-1$
- return null;
- }
- String defaultRuntimeID = defaultProductRuntimeKey.substring(0, seperatorIndex);
- String defaultFacetVersion = defaultProductRuntimeKey.substring(seperatorIndex + 1);
- for (Iterator runtimeIt = runtimes.iterator(); runtimeIt.hasNext();) {
- IRuntime runtime = (IRuntime) runtimeIt.next();
- List runtimeComps = runtime.getRuntimeComponents();
- if (!runtimeComps.isEmpty()) {
- for (Iterator compsIter = runtimeComps.iterator(); compsIter.hasNext();) {
- IRuntimeComponent runtimeComp = (IRuntimeComponent) compsIter.next();
- if (defaultRuntimeID.equals(runtimeComp.getRuntimeComponentType().getId()) &&
- (defaultFacetVersion.equals(runtimeComp.getRuntimeComponentVersion().getVersionString()))) {
- return runtime;
- }
- }
- }
- }
- //No matches found.
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
deleted file mode 100644
index c551407..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.core.internal.resources.ResourceStatus;
-import org.eclipse.core.internal.utils.Messages;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.web.internal.ResourceHandler;
-
-import com.ibm.icu.text.UTF16;
-import com.ibm.icu.util.StringTokenizer;
-
-public class SimpleWebFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ISimpleWebFacetInstallDataModelProperties {
-
- public SimpleWebFacetInstallDataModelProvider() {
- super();
- }
-
- @Override
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CONTENT_DIR);
- names.add(CONTEXT_ROOT);
- return names;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CONTENT_DIR)) {
- return "WebContent"; //$NON-NLS-1$
- } else if (propertyName.equals(CONTEXT_ROOT)) {
- return getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
- } else if (propertyName.equals(FACET_ID)) {
- return IModuleConstants.WST_WEB_MODULE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (FACET_PROJECT_NAME.equals(propertyName)) {
- model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
- }
- return super.propertySet(propertyName, propertyValue);
- }
-
- @Override
- public IStatus validate(String name) {
- if (name.equals(CONTEXT_ROOT)) {
- return validateContextRoot(getStringProperty(CONTEXT_ROOT));
- }
- else if (name.equals(CONTENT_DIR)) {
- String folderName = model.getStringProperty(CONTENT_DIR);
- if (folderName == null || folderName.length() == 0 || folderName.equals("/") || folderName.equals("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
- // all folders which meet the criteria of "CONFIG_FOLDER" are required
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.WEBCONTENTFOLDER_EMPTY);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- IStatus status = validateFolderName(folderName);
- if (status.isOK())
- {
- if (folderName.indexOf('#') != -1) {
- String message = NLS.bind(Messages.resources_invalidCharInName, "#", folderName); //$NON-NLS-1$
- status = new ResourceStatus(IResourceStatus.INVALID_VALUE, null, message);
- }
- }
- return status;
- }
-
- return super.validate(name);
- }
-
- protected IStatus validateContextRoot(String contextRoot) {
- if (contextRoot == null || contextRoot.length() == 0) {
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Context_Root_cannot_be_empty_2);
- } else if (contextRoot.trim().equals(contextRoot)) {
- StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
- while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- int cp;
- for (int i = 0; i < token.length(); i += UTF16.getCharCount(cp)) {
- cp = UTF16.charAt(token, i);
- if(token.charAt(i) == ' ')
- {
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Names_cannot_contain_whitespace);
- }
- else if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
- String invalidCharString = null;
- if (UTF16.getCharCount(cp)>1)
- {
- invalidCharString = UTF16.valueOf(cp);
- }
- else
- {
- invalidCharString = (new Character(token.charAt(i))).toString();
- }
- Object[] invalidChar = new Object[]{invalidCharString};
- String errorStatus = ResourceHandler.getString(ResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar);
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, errorStatus);
- }
- }
- }
- } else
- {
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Names_cannot_contain_whitespace);
- }
- return OK_STATUS;
- }
-
- protected IStatus validateFolderName(String folderName) {
- // the directory is not required, but if the name is entered ensure that it
- // contains only valid characters.
- if (folderName == null || folderName.length() == 0) {
- return OK_STATUS;
- }
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(folderName);
- for (int i = 0, max = path.segmentCount(); i < max; i++) {
- IStatus status = workspace.validateName(path.segment(i), IResource.FOLDER);
- if (! status.isOK())
- return status;
- }
-
- // all of the potential segments of the folder have been verified
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
deleted file mode 100644
index 15276d6..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class SimpleWebFacetInstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- if (monitor != null)
- monitor.beginTask("", 1); //$NON-NLS-1$
- try {
- IDataModel model = (IDataModel) config;
- addNatures(project);
- final IVirtualComponent c = ComponentCore.createComponent(project, false);
- c.create(0, null);
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
- final IPath contentdir = setContentPropertyIfNeeded(model, pjpath, project);
- mkdirs(ws.getRoot().getFolder(contentdir));
-
- final IVirtualFolder webroot = c.getRootFolder();
- if (webroot.getProjectRelativePath().equals(new Path("/"))) { //$NON-NLS-1$
- webroot.createLink(new Path("/" + model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
- }
-
- ComponentUtilities.setServerContextRoot(project,model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTEXT_ROOT));
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- WSTWebPlugin.logError(e);
- }
- } finally {
- if (monitor != null)
- monitor.done();
- }
- }
-
- private IPath setContentPropertyIfNeeded(final IDataModel model, final IPath pjpath, IProject project) {
- IVirtualComponent c = ComponentCore.createComponent(project);
- if (c.exists()) {
- if( !c.getRootFolder().getProjectRelativePath().isRoot() ){
- return c.getRootFolder().getUnderlyingResource().getFullPath();
- }
- }
- return pjpath.append(model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR));
- }
-
- private void addNatures(final IProject project) throws CoreException {
- final IProjectDescription desc = project.getDescription();
- final String[] current = desc.getNatureIds();
- final String[] replacement = new String[current.length + 1];
- System.arraycopy(current, 0, replacement, 0, current.length);
- replacement[current.length] = IModuleConstants.MODULE_NATURE_ID;
- desc.setNatureIds(replacement);
- project.setDescription(desc, null);
- }
-
- private static void mkdirs(final IFolder folder) throws CoreException {
- if (!folder.exists()) {
- if (folder.getParent() instanceof IFolder) {
- mkdirs((IFolder) folder.getParent());
- }
- folder.create(true, true, null);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 90020ff..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class SimpleWebFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
-
- public SimpleWebFacetProjectCreationDataModelProvider() {
- super();
- }
-
- @Override
- public void init() {
- super.init();
-
- Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
- requiredFacets.add(ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE));
- setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
deleted file mode 100644
index 2445796..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class SimpleWebFacetUninstallDelegate implements IDelegate {
-
- public SimpleWebFacetUninstallDelegate() {
- super();
- }
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- if (monitor != null)
- monitor.beginTask("", 1); //$NON-NLS-1$
- try {
- // Remove the .component file
- IFile file = project.getFile(StructureEdit.MODULE_META_FILE_NAME);
- file.delete(true, monitor);
-
- // Remove the module core nature
- ProjectUtilities.removeNatureFromProject(project, IModuleConstants.MODULE_NATURE_ID);
- } finally {
- if (monitor != null)
- monitor.done();
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
deleted file mode 100644
index 1eedfa2..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-/*
- * Created on December 14, 2004
- */
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-
-/**
- * An object which represents the user-defined contents of an extension in a plug-in manifest.
- */
-public class DelegateConfigurationElement implements IConfigurationElement {
-
- private final IConfigurationElement delegateElement;
- private static final String DELEGATE_NAME = "delegateConfigurationElement"; //$NON-NLS-1$
- private static final String DELEGATE_NAMESPACE = "delegateConfigurationElementNamespace"; //$NON-NLS-1$
- private static final String DELEGATE_NULL_STRING = "delegateConfigurationElement: NULL"; //$NON-NLS-1$
-
- public DelegateConfigurationElement(IConfigurationElement aDelegate) {
- delegateElement = aDelegate;
- }
-
- /**
- * @param propertyName
- * @return
- * @throws org.eclipse.core.runtime.CoreException
- */
- public Object createExecutableExtension(String propertyName) throws CoreException {
- if (delegateElement == null)
- return null;
- return delegateElement.createExecutableExtension(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (delegateElement == null)
- return false;
- return delegateElement.equals(obj);
- }
-
- /**
- * @param name
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getAttribute(String name) throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getAttribute(name);
- }
-
- /**
- * @param name
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getAttributeAsIs(String name) throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getAttributeAsIs(name);
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String[] getAttributeNames() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return new String[0];
- return delegateElement.getAttributeNames();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public IConfigurationElement[] getChildren() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return new IConfigurationElement[0];
- return delegateElement.getChildren();
- }
-
- /**
- * @param name
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public IConfigurationElement[] getChildren(String name) throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return new IConfigurationElement[0];
- return delegateElement.getChildren(name);
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public IExtension getDeclaringExtension() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- throw new InvalidRegistryObjectException();
- return delegateElement.getDeclaringExtension();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getName() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return DELEGATE_NAME;
- return delegateElement.getName();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getNamespace() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return DELEGATE_NAMESPACE;
- return delegateElement.getNamespace();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public Object getParent() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getParent();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getValue() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getValue();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getValueAsIs() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getValueAsIs();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- if (delegateElement == null)
- return -1;
- return delegateElement.hashCode();
- }
-
- /**
- * @return
- */
- public boolean isValid() {
-
- if (delegateElement == null)
- return false;
- return delegateElement.isValid();
- }
-
- /**
- * @return
- */
- public int getHandleId() {
- if( delegateElement == null )
- return -1;
- return delegateElement.getHandleId();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- if (delegateElement == null)
- return DELEGATE_NULL_STRING;
- return delegateElement.toString();
- }
-
- public IConfigurationElement toEquinox() {
- return null;
- }
-
- public IContributor getContributor() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- throw new InvalidRegistryObjectException();
- return delegateElement.getContributor();
- }
-
- public String getNamespaceIdentifier() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return DELEGATE_NAMESPACE;
- return delegateElement.getNamespaceIdentifier();
- }
-
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=296122
- public String getAttribute(String attrName, String locale) throws InvalidRegistryObjectException {
- if (delegateElement == null) return null;
- return delegateElement.getAttribute(attrName, locale);
- }
-
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=296122
- public String getValue(String locale) throws InvalidRegistryObjectException {
- if (delegateElement == null) return null;
- return delegateElement.getValue(locale);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
deleted file mode 100644
index e58e260..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-
-public interface ISimpleWebModuleConstants
-{
- public static final String PLUG_IN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
- public static final String STATIC_PROJECT_TYPE = "STATIC"; //$NON-NLS-1$
- public static final String CSS_DIRECTORY = "theme"; //$NON-NLS-1$
- public static final String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
- public static final String LIBRARY_DIRECTORY = "lib"; //$NON-NLS-1$
- public static final String CLASSES_DIRECTORY = "classes"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
deleted file mode 100644
index 0f4e7aa..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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
- **************************************************************************************************/
-package org.eclipse.wst.web.internal;
-
-public interface IWSTWebPreferences {
- String PREF_STATICWEBCONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
deleted file mode 100644
index 7167724..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "staticwebproject";//$NON-NLS-1$
-
- private ResourceHandler() {
- // Do not instantiate
- }
-
- public static String StaticWebProjectCreationWizard_Wizard_Title;
- public static String StaticWebProjectWizardBasePage_Page_Description;
- public static String StaticWebSettingsPropertiesPage_Web_Content_Label;
- public static String StaticContextRootComposite_Context_Root_Label;
- public static String StaticWebProjectWizardBasePage_Page_Title;
- public static String StaticWebSettingsPropertiesPage_Not_available_for_closed_projects;
- public static String TargetRuntime;
- public static String NewDotDotDot;
- public static String InvalidServerTarget;
- public static String ConfigureSettings;
- public static String Context_Root_cannot_be_empty_2;
- public static String Names_cannot_contain_whitespace;
- public static String The_character_is_invalid_in_a_context_root;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
deleted file mode 100644
index d14b6c8..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.MultiStatus;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebPlugin extends Plugin
-{
- //The shared instance.
- private static WSTWebPlugin plugin;
-
- private WSTWebPreferences preferences;
-
- public static final String VALIDATION_BUILDER_ID = ValidationPlugin.VALIDATION_BUILDER_ID; // plugin
-
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- //the ID for this plugin (added automatically by logging quickfix)
- public static final String PLUGIN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
- /**
- * The constructor.
- */
- public WSTWebPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static WSTWebPlugin getDefault()
- {
- return plugin;
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- @Override
- protected void initializeDefaultPluginPreferences() {
- getWSTWebPreferences().initializeDefaultPreferences();
- }
- /**
- * @return Returns the preferences.
- */
- public WSTWebPreferences getWSTWebPreferences() {
- if (this.preferences == null)
- this.preferences = new WSTWebPreferences(this);
- return this.preferences;
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(String message) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message));
- }
-
- public static void logError(String message, Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message, exception));
- }
-
- public static void logError(String message, CoreException exception) {
- MultiStatus status = new MultiStatus(PLUGIN_ID,IStatus.ERROR,new IStatus[]{exception.getStatus()},message,exception);
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( status );
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
deleted file mode 100644
index fd5256a..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
- public interface Keys {
- final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
- }
- public interface Values {
- final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- }
- public interface Defaults {
- final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
- }
- private Plugin owner = null;
- private Preferences preferences = null;
- private boolean persistOnChange = false;
-
- public WSTWebPreferences(Plugin owner) {
- this.owner = owner;
- }
- protected void initializeDefaultPreferences() {
- getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
- }
-
- public String getStaticWebContentFolderName() {
- return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
- }
-
- public void setStaticWebContentFolderName(String value) {
- getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
- firePreferenceChanged();
- }
-
- public void firePreferenceChanged() {
- if (isPersistOnChange())
- persist();
- }
-
- public void persist() {
- getOwner().savePluginPreferences();
- }
-
- /**
- * @return Returns the persistOnChange.
- */
- public boolean isPersistOnChange() {
- return this.persistOnChange;
- }
-
- /**
- * @param persistOnChange
- * The persistOnChange to set.
- */
- public void setPersistOnChange(boolean persistOnChange) {
- this.persistOnChange = persistOnChange;
- }
-
- private Preferences getPreferences() {
- if (this.preferences == null)
- this.preferences = getOwner().getPluginPreferences();
- return this.preferences;
- }
-
- /**
- * @return Returns the owner.
- */
- private Plugin getOwner() {
- return this.owner;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
deleted file mode 100644
index efa92d0..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebPropertiesUtil {
- private static final char[] BAD_CHARS = {'/', '\\', ':'};
- /**
- * @param project
- * org.eclipse.core.resources.IProject
- */
- /**
- * Returns a error message that states whether a context root is valid or not returns null if
- * context root is fine
- *
- * @return java.lang.String
- * @param contextRoot
- * java.lang.String
- */
- public static String validateContextRoot(String contextRoot) {
-
- if (contextRoot == null)
- return null;
-
- String errorMessage = null;
-
- String name = contextRoot;
- if (name.equals("")) { //$NON-NLS-1$
- // this was added because the error message shouldnt be shown initially. It should be
- // shown only if context root field is edited to
- errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //errorMessage = ProjectSupportResourceHandler.getString("Context_Root_cannot_be_empty_2"); //$NON-NLS-1$
- return errorMessage;
- }
-
- /*******************************************************************************************
- * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
- * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
- * errorMessage;
- * }
- ******************************************************************************************/
-
- if (name.trim().equals(name)) {
- StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
- outer : while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- for (int i = 0; i < token.length(); i++) {
- if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
- if (Character.isWhitespace(token.charAt(i))) {
- //Removed because context roots can contain white space
- //errorMessage =
- // ResourceHandler.getString("_Context_root_cannot_conta_UI_");//$NON-NLS-1$
- // = " Context root cannot contain whitespaces."
- } else {
- errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //errorMessage = ProjectSupportResourceHandler.getString("The_character_is_invalid_in_a_context_root", new Object[]{(new Character(token.charAt(i))).toString()}); //$NON-NLS-1$
- break outer;
- }
- }
- }
- }
- } // en/ end of if(name.trim
- else
- errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
- //errorMessage = ProjectSupportResourceHandler.getString("Names_cannot_begin_or_end_with_whitespace_5"); //$NON-NLS-1$
-
- return errorMessage;
- }
-
-
- /**
- * Return true if the string contains any of the characters in the array.
- */
- private static boolean contains(String str, char[] chars) {
- for (int i = 0; i < chars.length; i++) {
- if (str.indexOf(chars[i]) != -1)
- return true;
- }
- return false;
- }
-
-
- public static String validateFolderName(String folderName) {
- if (folderName.length() == 0)
- return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //return ProjectSupportResourceHandler.getString("Folder_name_cannot_be_empty_2"); //$NON-NLS-1$
-
- if (contains(folderName, BAD_CHARS))
- return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //return ProjectSupportResourceHandler.getString("Folder_name_is_not_valid", new Object[]{folderName}); //$NON-NLS-1$
-
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
deleted file mode 100644
index afc69b6..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ModuleFile;
-import org.eclipse.wst.server.core.util.ModuleFolder;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-/**
- * @deprecated as of WTP 3.2
- */
-public abstract class ComponentDeployable extends ProjectModule {
-
- protected IVirtualComponent component = null;
- protected List<IModuleResource> members = new ArrayList<IModuleResource>();
-
- public ComponentDeployable(IProject project) {
- this(project,ComponentCore.createComponent(project));
- }
-
- public ComponentDeployable(IProject project, IVirtualComponent aComponent) {
- super(project);
- this.component = aComponent;
- }
-
- /**
- * @see org.eclipse.jst.server.core.IJ2EEModule#isBinary()
- */
- public boolean isBinary() {
- if (component==null)
- return false;
- return component.isBinary();
- }
-
- /**
- * Add the resources from mr to the existing resources in Module Folder mf
- * @param ModuleFolder mf
- * @param IModuleResource[] mr
- */
- protected void addMembersToModuleFolder(ModuleFolder mf, IModuleResource[] mr) {
- // If the folder is null or the resources to add are null or empty, bail and return
- if (mf == null || mr == null || mr.length==0)
- return;
- // Get the existing members in the module folder
- IModuleResource[] mf_members = mf.members();
- int mf_size = 0;
- // Get the length of the existing members in the module folder
- if (mf_members != null)
- mf_size = mf_members.length;
- // Create a new array to set on the module folder which will combine the existing and
- // new module resources
- IModuleResource[] res = new IModuleResource[mf_size + mr.length];
- // Copy the existing members into the array if there are any
- if (mf_members != null && mf_size > 0)
- System.arraycopy(mf_members, 0, res, 0, mf_size);
- // Copy the new members into the array
- System.arraycopy(mr, 0, res, mf_size, mr.length);
- // Set the new members array on the module folder
- mf.setMembers(res);
- }
-
- /**
- * Returns the child modules of this module.
- *
- * @return org.eclipse.wst.server.core.model.IModule[]
- */
- @Override
- public IModule[] getChildModules() {
- return getModules();
- }
-
- public IModule[] getModules() {
- List<IModule> modules = new ArrayList<IModule>();
- if (component != null) {
- IVirtualReference[] components = getReferences(component);
- for (int i = 0; i < components.length; i++) {
- IVirtualReference reference = components[i];
- if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_USES) {
- IVirtualComponent virtualComp = reference.getReferencedComponent();
- IModule module = gatherModuleReference(component, virtualComp);
- if (module != null && !modules.contains(module))
- modules.add(module);
- }
- }
- }
- return modules.toArray(new IModule[modules.size()]);
- }
-
- protected IVirtualReference[] getReferences(IVirtualComponent aComponent) {
- return aComponent.getReferences();
- }
-
- protected IModule gatherModuleReference(IVirtualComponent component, IVirtualComponent targetComponent ) {
- // Handle workspace project module components
- if (targetComponent != null && targetComponent.getProject()!=component.getProject()) {
- if (!targetComponent.isBinary())
- return ServerUtil.getModule(targetComponent.getProject());
- }
- return null;
- }
-
- /**
- * Find the module resources for a given container and path. Inserts in the java containers
- * at a given path if not null.
- *
- * @param cont a container
- * @param path the current module relative path
- * @param javaPath the path where Java resources fit in the root
- * @param javaCont
- * @return a possibly-empty array of module resources
- * @throws CoreException
- */
- protected IModuleResource[] getMembers(IContainer cont, IPath path, IPath javaPath, IContainer[] javaCont) throws CoreException {
- IResource[] res = cont.members();
- int size2 = res.length;
- List<IModuleFile> list = new ArrayList<IModuleFile>(size2);
- for (int j = 0; j < size2; j++) {
- if (res[j] instanceof IContainer) {
- IContainer cc = (IContainer) res[j];
-
- IPath newPath = path.append(cc.getName()).makeRelative();
- // Retrieve already existing module folder if applicable
- ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,newPath);
- if (mf == null) {
- mf = new ModuleFolder(cc, cc.getName(), path);
- ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
- if (path.isEmpty())
- members.add(mf);
- else {
- if (parent == null)
- parent = ensureParentExists(path, cc);
- addMembersToModuleFolder(parent, new IModuleResource[] {mf});
- }
- }
- IModuleResource[] mr = getMembers(cc, newPath, javaPath, javaCont);
-
- if (javaPath != null && newPath.isPrefixOf(javaPath))
- mr = handleJavaPath(path, javaPath, newPath, javaCont, mr, cc);
-
- addMembersToModuleFolder(mf, mr);
-
- } else {
- IFile f = (IFile) res[j];
- // Handle the default package case
- if (path.equals(javaPath)) {
- ModuleFolder mFolder = (ModuleFolder) getExistingModuleResource(members,javaPath);
- IModuleFile mFile = createModuleFile(f, javaPath);
- if (mFolder != null)
- addMembersToModuleFolder(mFolder,new IModuleResource[]{mFile});
- else
- list.add(mFile);
- } else {
- IModuleFile mf = createModuleFile(f, path);
- list.add(mf);
- }
- }
- }
- IModuleResource[] mr = new IModuleResource[list.size()];
- list.toArray(mr);
- return mr;
- }
-
- protected IModuleFile createModuleFile(final IFile file, final IPath path) {
- return new ModuleFile(file, file.getName(), path);
- }
-
- protected IModuleResource[] getMembers(IVirtualContainer cont, IPath path) throws CoreException {
- IVirtualResource[] res = cont.members();
- int size2 = res.length;
- List<IModuleFile> list = new ArrayList<IModuleFile>(size2);
- for (int j = 0; j < size2; j++) {
- if (res[j] instanceof IVirtualContainer) {
- IVirtualContainer cc = (IVirtualContainer) res[j];
- // Retrieve already existing module folder if applicable
- ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,path.append(new Path(cc.getName()).makeRelative()));
- if (mf == null) {
- mf = new ModuleFolder((IContainer)cc.getUnderlyingResource(), cc.getName(), path);
- ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
- if (path.isEmpty())
- members.add(mf);
- else {
- if (parent == null)
- parent = ensureParentExists(path, (IContainer)cc.getUnderlyingResource());
- addMembersToModuleFolder(parent, new IModuleResource[] {mf});
- }
- }
- IModuleResource[] mr = getMembers(cc, path.append(cc.getName()));
- addMembersToModuleFolder(mf, mr);
- } else {
- IFile f = (IFile) res[j].getUnderlyingResource();
- IModuleFile mf = null;
- if (shouldAddComponentFile(f)) {
- mf = createModuleFile(f, path);
- list.add(mf);
- }
- }
- }
- IModuleResource[] mr = new IModuleResource[list.size()];
- list.toArray(mr);
- return mr;
- }
-
- protected ModuleFolder ensureParentExists(IPath path, IContainer cc) {
- ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
- if (parent == null) {
- String folderName = path.lastSegment();
- IPath folderPath = Path.EMPTY;
- if (path.segmentCount()>1)
- folderPath = path.removeLastSegments(1);
- parent = new ModuleFolder(cc, folderName, folderPath);
- if (path.segmentCount()>1)
- addMembersToModuleFolder(ensureParentExists(path.removeLastSegments(1),cc), new IModuleResource[] {parent});
- else
- members.add(parent);
- }
- return parent;
- }
-
- /**
- * This method is meant to be overridden by subclasses. Return whether or not to add this file
- * to the members list.
- *
- * @param file
- * @return boolean should add file?
- */
- protected boolean shouldAddComponentFile(IFile file) {
- return true;
- }
-
- /**
- * Check the current cache to see if we already have an existing module resource for
- * the given path.
- * @param aList
- * @param path
- * @return an existing moduleResource from the cached result
- */
-
- protected IModuleResource getExistingModuleResource(List aList, IPath path) {
- // If the list is empty, return null
- if (aList==null || aList.isEmpty() || path == null)
- return null;
- // Otherwise recursively check to see if given resource matches current resource or if it is a child
- String[] pathSegments = path.segments();
- IModuleResource moduleResource = null;
-
- if(pathSegments.length == 0)
- return null;
- for (Iterator iter = aList.iterator(); iter.hasNext();) {
- moduleResource = (IModuleResource) iter.next();
- String[] moduleSegments = moduleResource.getModuleRelativePath().segments();
- // If the last segment in passed in path equals the module resource name
- // and segment count is the same and the path segments start with the module path segments
- // then we have a match and we return the existing moduleResource
- if (pathSegments[pathSegments.length - 1].equals(moduleResource.getName()) &&
- (moduleSegments.length + 1) == pathSegments.length &&
- startsWith(moduleSegments, pathSegments))
- return moduleResource;
-
- // Otherwise, if it is a folder, check its children for the existing resource path
- // but only check if the beginning segments are a match
- if(moduleResource instanceof IModuleFolder &&
- startsWith(moduleSegments, pathSegments) && pathSegments.length > moduleSegments.length &&
- moduleResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0]))
- if (((IModuleFolder)moduleResource).members()!=null)
- return getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path);
- }
- return null;
- }
-
- /**
- *
- * @param beginningSegments
- * @param testSegments
- * @return True if beginningSegments[i] == testSegments[i] for all 0<=i<beginningSegments[i]
- */
- private boolean startsWith(String[] beginningSegments, String[] testSegments) {
- for(int i=0; i < beginningSegments.length; i++) {
- if(!beginningSegments[i].equals(testSegments[i]))
- return false;
- }
- return true;
- }
-
- protected IModuleResource[] handleJavaPath(IPath path, IPath javaPath, IPath curPath, IContainer[] javaCont, IModuleResource[] mr, IContainer cc) throws CoreException {
- //subclasses may override
- return new IModuleResource[]{};
- }
-
- @Override
- public IModuleResource[] members() throws CoreException {
- members.clear();
- IVirtualComponent vc = ComponentCore.createComponent(getProject());
- if (vc != null) {
- IVirtualFolder vFolder = vc.getRootFolder();
- IModuleResource[] mr = getMembers(vFolder, Path.EMPTY);
- int size = mr.length;
- for (int j = 0; j < size; j++) {
- members.add(mr[j]);
- }
- addUtilMembers(vc);
- }
-
- IModuleResource[] mr = new IModuleResource[members.size()];
- members.toArray(mr);
- return mr;
- }
-
- protected boolean shouldIncludeUtilityComponent(IVirtualComponent virtualComp, IVirtualReference[] components, ArtifactEdit edit) {
- return virtualComp != null && virtualComp.isBinary() && virtualComp.getProject()==component.getProject();
- }
-
- protected void addUtilMembers(IVirtualComponent vc) {
- ArtifactEdit edit = null;
- try {
- edit = getComponentArtifactEditForRead();
- IVirtualReference[] components = vc.getReferences();
- for (int i = 0; i < components.length; i++) {
- IVirtualReference reference = components[i];
- IVirtualComponent virtualComp = reference.getReferencedComponent();
- if (shouldIncludeUtilityComponent(virtualComp,components,edit)) {
- addUtilMember(vc, reference, reference.getRuntimePath());
- }
- }
- } finally {
- if (edit!=null)
- edit.dispose();
- }
- }
-
- protected void addUtilMember(IVirtualComponent parent, IVirtualReference reference, IPath runtimePath) {
- IModuleFile mf = null;
- final String archiveName2 = reference.getArchiveName();
- final String archiveName = new Path(archiveName2).lastSegment();
- final IVirtualComponent virtualComp = reference.getReferencedComponent();
- IFile ifile = virtualComp.getAdapter(IFile.class);
- if (ifile != null) { //In Workspace
- String name = null != archiveName ? archiveName : ifile.getName();
- mf = new ModuleFile(ifile, name, runtimePath.makeRelative());
- } else {
- File extFile = virtualComp.getAdapter(File.class);
- String name = null != archiveName ? archiveName : extFile.getName();
- mf = new ModuleFile(extFile, name, runtimePath.makeRelative());
- }
- IModuleResource moduleParent = getExistingModuleResource(members, mf.getModuleRelativePath());
- if (moduleParent != null && moduleParent instanceof ModuleFolder) {
- addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[]{mf});
- } else {
- if (mf.getModuleRelativePath().isEmpty()) {
- members.add(mf);
- } else {
- if (moduleParent == null) {
- moduleParent = ensureParentExists(mf.getModuleRelativePath(), (IContainer)parent.getRootFolder().getUnderlyingResource());
- }
- addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[] {mf});
- }
- }
- }
-
- protected ArtifactEdit getComponentArtifactEditForRead() {
- return null;
- }
-
- protected static boolean isProjectOfType(IProject project, String typeID) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return false;
- }
-
- if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
- }
- return false;
- }
-
- /**
- * Returns the root folders for the resources in this module.
- *
- * @return a possibly-empty array of resource folders
- */
- public IContainer[] getResourceFolders() {
- IVirtualComponent vc = ComponentCore.createComponent(getProject());
- if (vc != null) {
- IVirtualFolder vFolder = vc.getRootFolder();
- if (vFolder != null)
- return vFolder.getUnderlyingFolders();
- }
- return new IContainer[]{};
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
deleted file mode 100644
index 5aaa05c..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat 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:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.internal.flat.FlattenParticipantModel;
-import org.eclipse.wst.common.componentcore.internal.flat.IChildModuleReference;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFile;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatVirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ModuleFile;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-public abstract class FlatComponentDeployable extends ProjectModule implements IFlatDeployable {
-
- public static final String FLATTEN_PARTICIPANTS = "org.eclipse.wst.web.deployables.flatten.participants"; //$NON-NLS-1$
- private static final String FLATTEN_PARTICIPANTS_DELIM = ","; //$NON-NLS-1$
-
- /*
- * Register an adapt IModule to IVirtualComponent
- */
- static {
- Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
- public Class[] getAdapterList() {
- return new Class[] { IVirtualComponent.class };
- }
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adaptableObject instanceof IModule) {
- IModule module = (IModule) adaptableObject;
- FlatComponentDeployable deployable = (FlatComponentDeployable) module.loadAdapter(FlatComponentDeployable.class, null);
- if(deployable != null){
- IVirtualComponent virtualComponent = deployable.getComponent();
- return virtualComponent;
- }
- }
- return null;
- }
- }, IModule.class);
- }
-
- protected IVirtualComponent component = null;
- protected List<IModuleResource> members = new ArrayList<IModuleResource>();
-
- public FlatComponentDeployable(IProject project) {
- this(project,ComponentCore.createComponent(project));
- }
-
- public FlatComponentDeployable(IProject project, IVirtualComponent aComponent) {
- super(project);
- this.component = aComponent;
- }
-
- public IVirtualComponent getComponent() {
- return component;
- }
-
- /**
- * We will cache the flattened piece here, and instead redirect
- * the module factories to recreate the modules *whenever* there is
- * a workspace change. This will still be much more efficient than
- * traversing the tree each time a call to getResources() or getChildModules().
- */
- private FlatVirtualComponent cacheFlattened = null;
-
-
- public boolean shouldCache() {
- return false;
- }
-
- public void clearCache() {
- cacheFlattened = null;
- }
-
- /**
- * The export model is what does the grunt of the work
- * @return
- */
- protected IFlatVirtualComponent getFlatComponent() {
- if( !shouldCache() || cacheFlattened == null ) {
- FlatComponentTaskModel options = new FlatComponentTaskModel();
- options.put(FlatVirtualComponent.PARTICIPANT_LIST, Arrays.asList(getParticipants()));
- FlatVirtualComponent tmp = new FlatVirtualComponent(component, options);
- if( shouldCache())
- cacheFlattened = tmp;
- return tmp;
- }
- return cacheFlattened;
- }
-
- /**
- * Subclasses can provide a list of participants who may
- * be involved in forming the export model
- *
- * A deployable with no participant should still properly
- * consume consumed references and traverse the model appropriately
- *
- * @return
- */
- public IFlattenParticipant[] getParticipants() {
- String[] ids = getParticipantIds();
- return getFlattenParticipants(ids);
- }
-
- public String[] getParticipantIds() {
- // If file exists, load from file
- String participants = component.getMetaProperties().getProperty(FLATTEN_PARTICIPANTS);
- // else, get the default ones
- String[] split = participants == null ? getDefaultFlattenParticipantIDs() : participants.split(FLATTEN_PARTICIPANTS_DELIM);
- for( int i = 0; i < split.length; i++ ) {
- split[i] = split[i].trim();
- }
- return split;
- }
-
- protected IFlattenParticipant[] getFlattenParticipants(String[] ids) {
- ArrayList<IFlattenParticipant> participants = new ArrayList<IFlattenParticipant>();
- IFlattenParticipant tmp;
- for( int i = 0; i < ids.length; i++ ) {
- tmp = FlattenParticipantModel.getDefault().getParticipant(ids[i]);
- if( tmp != null )
- participants.add(tmp);
- else {
- // Log? This is an error somehow
- }
- }
- return participants.toArray(new IFlattenParticipant[participants.size()]);
- }
-
-
- public void addFlattenParticipant(String id, int position) {
- String participants = component.getMetaProperties().getProperty(FLATTEN_PARTICIPANTS);
- String[] split = participants == null ? getDefaultFlattenParticipantIDs() : participants.split(","); //$NON-NLS-1$
- ArrayList<String> asList = new ArrayList<String>();
- asList.addAll(Arrays.asList(split));
- if( !asList.contains(id)) {
- if( position < asList.size())
- asList.add(position, id);
- else
- asList.add(id);
- }
- String asString = implode(asList.toArray(new String[asList.size()]), FLATTEN_PARTICIPANTS_DELIM);
- component.setMetaProperty(FLATTEN_PARTICIPANTS, asString);
- }
-
- private String implode(String[] array, String delim) {
- String retval;
- if (array.length==0) {
- retval = ""; //$NON-NLS-1$
- } else {
- StringBuffer sb = new StringBuffer();
- sb.append(array[0]);
- for (int i=1;i<array.length;i++) {
- sb.append(delim);
- sb.append(array[i]);
- }
- retval = sb.toString();
- }
- return retval;
- }
-
- public void removeFlattenParticipant(String id) {
- String participants = component.getMetaProperties().getProperty(FLATTEN_PARTICIPANTS);
- String[] split = participants == null ? getDefaultFlattenParticipantIDs() : participants.split(","); //$NON-NLS-1$
- ArrayList<String> asList = new ArrayList<String>();
- asList.addAll(Arrays.asList(split));
- asList.remove(id);
- String asString = implode(asList.toArray(new String[asList.size()]), FLATTEN_PARTICIPANTS_DELIM);
- component.setMetaProperty(FLATTEN_PARTICIPANTS, asString);
- }
-
-
- /**
- * Get a list of participant keys that are default for this project type
- * @return
- */
- public String[] getDefaultFlattenParticipantIDs() {
- return new String[0];
- }
-
- public boolean isBinary() {
- return component == null ? false : component.isBinary();
- }
-
- @Override
- public IModuleResource[] members() throws CoreException {
- if( component.isBinary() )
- return LEGACY_binaryMembers();
-
- IFlatVirtualComponent em = getFlatComponent();
- IFlatResource[] resources = em.fetchResources();
- return convert(resources);
-
- }
-
- protected IModuleResource[] LEGACY_binaryMembers() {
- IFile ifile = component.getAdapter(IFile.class);
- File file = component.getAdapter(File.class);
- ModuleFile mf = ifile != null ? new ModuleFile(ifile, ifile.getName(), new Path("")) //$NON-NLS-1$
- : new ModuleFile(file, file.getName(), new Path("")); //$NON-NLS-1$
- return new IModuleResource[]{mf};
- }
-
- /**
- * Returns the child modules of this module.
- *
- * @return org.eclipse.wst.server.core.model.IModule[]
- */
- @Override
- public IModule[] getChildModules() {
- return getModules();
- }
-
- public /* non api */ IChildModuleReference[] getExportModelChildren() throws CoreException {
- IFlatVirtualComponent em = getFlatComponent();
- IChildModuleReference[] children = em.getChildModules();
- return children;
- }
-
- public IModule[] getModules() {
- // Legacy, here in case the old modules are used
- if( component.isBinary() )
- return new IModule[]{};
-
- try {
- List<IModule> modules = new ArrayList<IModule>();
- IChildModuleReference[] children = getExportModelChildren();
- for( int i = 0; i < children.length; i++ ) {
- IModule child = gatherModuleReference(component, children[i]);
- if( child != null )
- modules.add(child);
- }
- return modules.toArray(new IModule[modules.size()]);
- } catch( CoreException ce ) {
- }
- return new IModule[]{};
- }
-
- @Override
- public String getPath(IModule m) {
- return getURI(m);
- }
-
- /**
- * Returns the URI of the given contained CHILD module.
- *
- * SOFT requirements (NOT API!!) in use by some adopters
- * If the passed in module is equal to this module, return our own deployed name
- *
- * @param module a module
- * @return the URI of the given module, or <code>null</code> if the URI could
- * not be found
- */
- public String getURI(IModule module) {
- ProjectModule md = (ProjectModule)module.loadAdapter(ProjectModule.class, new NullProgressMonitor());
- if( md == this ) {
- // guess my own name
- return VirtualReferenceUtilities.INSTANCE.getDefaultProjectArchiveName(this.component);
- }
- try {
- FlatComponentDeployable cd = (FlatComponentDeployable)module.loadAdapter(FlatComponentDeployable.class, new NullProgressMonitor());
- if( cd != null ) {
- IFlatVirtualComponent em = getFlatComponent();
- IChildModuleReference[] children = em.getChildModules();
- for( int i = 0; i < children.length; i++ ) {
- IModule child = gatherModuleReference(component, children[i]);
- if( child != null && child.getId().equals(module.getId()))
- return children[i].getRelativeURI().toString();
- }
- }
- } catch( CoreException ce ) {
- }
- return null;
- }
-
- /**
- * If I know how to find an IModule for this child, do so now
- *
- * I would love to see this replaced with some API to locate a
- * possible child module based on a virtual component.
- *
- * @param component
- * @param targetComponent
- * @return
- */
- protected IModule gatherModuleReference(IVirtualComponent component, IChildModuleReference child) {
- // Handle workspace project module components
- // Subclasses should extend
- IVirtualComponent targetComponent = child.getComponent();
- if (targetComponent != null && targetComponent.getProject()!= component.getProject()) {
- if (!targetComponent.isBinary()) {
- return filterModuleDelegates(ServerUtil.getModules(targetComponent.getProject()));
- }
- }
- return null;
- }
-
- /**
- * An extender may wish to override this method in order to control which
- * delegate is returned in the scenario where more than one exist. By default
- * the first one found is returned.
- *
- * @param IModule[] modules
- * @return IModule[]
- */
- protected IModule filterModuleDelegates(IModule[] modules) {
- for (int i = 0; i < modules.length; i++) {
- ModuleDelegate md = (ModuleDelegate)modules[i].loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
- if (md instanceof ProjectModule) {
- return modules[i];
- }
- }
- return modules.length > 0 ? modules[0] : null;
- }
-
- /*
- * Below are STATIC utility classes and methods
- */
- protected static IModuleResource[] convert(IFlatResource[] resources) {
- ArrayList<IModuleResource> list = new ArrayList<IModuleResource>();
- for( int i = 0; i < resources.length; i++ ) {
- if( resources[i] instanceof IFlatFile)
- list.add(new ComponentModuleFile(resources[i]));
- else if( resources[i] instanceof IFlatFolder)
- list.add(new ComponentModuleFolder(resources[i]));
- }
- return list.toArray(new IModuleResource[list.size()]);
- }
-
- public static class ComponentModuleResource {
- protected IFlatResource delegate;
- public ComponentModuleResource(IFlatResource resource) {
- this.delegate = resource;
- }
- public long getModificationStamp() {
- return ((IFlatFile)delegate).getModificationStamp();
- }
-
- public IPath getModuleRelativePath() {
- return delegate.getModuleRelativePath();
- }
- public String getName() {
- return delegate.getName();
- }
- public Object getAdapter(Class adapter) {
- return delegate.getAdapter(adapter);
- }
- public IModuleResource[] members() {
- IFlatResource[] children = ((IFlatFolder)delegate).members();
- return convert(children);
- }
-
- @Override
- public String toString() {
-
- return getName();
- }
- }
-
- public static class ComponentModuleFile extends ComponentModuleResource implements IModuleFile{
- public ComponentModuleFile(IFlatResource resource) {
- super(resource);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this)
- return true;
-
- if (!(obj instanceof IModuleFile))
- return false;
-
- IModuleFile mf = (IModuleFile) obj;
- if (!getName().equals(mf.getName()))
- return false;
- if (!getModuleRelativePath().equals(mf.getModuleRelativePath()))
- return false;
- return true;
- }
-
- @Override
- public int hashCode() {
- return getName().hashCode() * 37 + getModuleRelativePath().hashCode();
- }
- }
-
- public static class ComponentModuleFolder extends ComponentModuleResource implements IModuleFolder {
- public ComponentModuleFolder(IFlatResource resource) {
- super(resource);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this)
- return true;
-
- if (!(obj instanceof IModuleFolder))
- return false;
-
- IModuleFolder mf = (IModuleFolder) obj;
- if (!getName().equals(mf.getName()))
- return false;
- if (!getModuleRelativePath().equals(mf.getModuleRelativePath()))
- return false;
- return true;
- }
-
- @Override
- public int hashCode() {
- return getName().hashCode() * 37 + getModuleRelativePath().hashCode();
- }
- }
-
- protected static boolean isProjectOfType(IProject project, String typeID) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return false;
- }
-
- if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IFlatDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IFlatDeployable.java
deleted file mode 100644
index cf28154..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IFlatDeployable.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat 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:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
-
-public interface IFlatDeployable {
- /**
- * Get a list of current flatten participants for this deployable
- * @return
- */
- public IFlattenParticipant[] getParticipants();
-
- /**
- * Get a list of current flatten participant id's for this deployable
- * @return
- */
- public String[] getParticipantIds();
-
- /**
- * Get a list of default flatten participants involved
- * for this module type
- *
- * @return
- */
- public String[] getDefaultFlattenParticipantIDs();
-
- /**
- * Add the flatten participant of the given id
- * and persist it in the project settings.
- *
- * @param id
- * @param position
- * @return
- */
- public void addFlattenParticipant(String id, int position);
-
- /**
- * Remove the flatten participant of the given id
- * and persist it in the project settings.
- *
- * @param id
- * @return
- */
- public void removeFlattenParticipant(String id);
-
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
deleted file mode 100644
index 7fd5bfb..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal.deployables;
-
-public interface IStaticWebModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
deleted file mode 100644
index a8e0b9a..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.util.IStaticWeb;
-
-public class StaticWebDeployable extends FlatComponentDeployable implements IStaticWeb {
-
- public StaticWebDeployable(IProject project, IVirtualComponent component) {
- super(project);
- }
-
- public String getContextRoot() {
- Properties props = component.getMetaProperties();
- if(props.containsKey("context-root")) //$NON-NLS-1$
- return props.getProperty("context-root"); //$NON-NLS-1$
- return component.getName();
- }
-
- /* TODO This is never called ?? */
-// public String getURI(IModule module) {
-// IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
-// String aURI = null;
-// if (comp !=null) {
-// if (!comp.isBinary() && isProjectOfType(module.getProject(),IModuleConstants.WST_WEB_MODULE)) {
-// IVirtualReference ref = component.getReference(comp.getName());
-// aURI = ref.getRuntimePath().append(comp.getName()+".war").toString(); //$NON-NLS-1$
-// }
-// }
-//
-// if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
-// aURI = aURI.substring(1);
-// return aURI;
-// }
-
- public String getVersion() {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(component.getProject());
- if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(IModuleConstants.WST_WEB_MODULE)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
- return facetedProject.getInstalledVersion(projectFacet).getVersionString();
- }
- } catch (Exception e) {
- //Ignore
- }
- return "1.0"; //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
deleted file mode 100644
index 4c4c6f0..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class StaticWebDeployableFactory extends ProjectModuleFactoryDelegate {
- private static final String ID = "org.eclipse.wst.web.internal.deployables.static"; //$NON-NLS-1$
- protected ArrayList moduleDelegates = new ArrayList();
-
- /*
- * @see DeployableProjectFactoryDelegate#getFactoryID()
- */
- public static String getFactoryId() {
- return ID;
- }
-
- /**
- * Use {@link #createModules(IProject)} instead.
- * @deprecated
- * @param nature
- * @return
- */
- protected IModule[] createModules(ModuleCoreNature nature) {
- if(nature != null){
- return createModules(nature.getProject());
- }
- return null;
- }
- /**
- * Returns true if the project represents a deployable project of this type.
- *
- * @param project
- * org.eclipse.core.resources.IProject
- * @return boolean
- */
- protected boolean isValidModule(IProject project) {
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject == null)
- return false;
- IProjectFacet webFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
- return facetedProject.hasProjectFacet(webFacet);
- } catch (Exception e) {
- return false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModuleDelegate(org.eclipse.wst.server.core.IModule)
- */
- @Override
- public ModuleDelegate getModuleDelegate(IModule module) {
- for (Iterator iter = moduleDelegates.iterator(); iter.hasNext();) {
- ModuleDelegate element = (ModuleDelegate) iter.next();
- if (module == element.getModule())
- return element;
- }
- return null;
-
- }
-
- @Override
- protected IModule[] createModules(IProject project) {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if(component != null){
- try {
- return createModuleDelegates(component);
- } catch (CoreException e) {
- WSTWebPlugin.logError(e);
- }
- }
- return null;
- }
-
- protected IModule[] createModuleDelegates(IVirtualComponent component) throws CoreException {
- if(component == null){
- return null;
- }
- StaticWebDeployable moduleDelegate = null;
- IModule module = null;
- try {
- if(isValidModule(component.getProject())) {
- moduleDelegate = new StaticWebDeployable(component.getProject(),component);
- module = createModule(component.getName(), component.getName(), IModuleConstants.WST_WEB_MODULE, moduleDelegate.getVersion(), moduleDelegate.getProject());
- moduleDelegate.initialize(module);
- }
- } catch (Exception e) {
- WSTWebPlugin.logError(e);
- } finally {
- if (module != null) {
- if (getModuleDelegate(module) == null)
- moduleDelegates.add(moduleDelegate);
- }
- }
- if (module == null)
- return null;
- return new IModule[] {module};
- }
-
- /**
- * Returns the list of resources that the module should listen to
- * for state changes. The paths should be project relative paths.
- * Subclasses can override this method to provide the paths.
- *
- * @return a possibly empty array of paths
- */
- @Override
- protected IPath[] getListenerPaths() {
- return new IPath[] {
- new Path(".project"), // nature //$NON-NLS-1$
- new Path(StructureEdit.MODULE_META_FILE_NAME), // component
- new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets //$NON-NLS-1$
- };
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
deleted file mode 100644
index b4ed6ad..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class StaticWebDeployableObjectAdapter extends ModuleArtifactAdapterDelegate implements IAdapterFactory
-
-{
-
- public StaticWebDeployableObjectAdapter() {
- super();
- }
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{IStaticWebModuleArtifact.class};
- }
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return StaticWebDeployableObjectAdapterUtil.getModuleObject(obj);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
deleted file mode 100644
index 4049324..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- *******************************************************************************/
-
-package org.eclipse.wst.web.internal.deployables;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.WebResource;
-
-public class StaticWebDeployableObjectAdapterUtil {
-
- private final static String[] extensionsToExclude = new String[]{"sql", "xmi"}; //$NON-NLS-1$ //$NON-NLS-2$
- static String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
-
- public static IModuleArtifact getModuleObject(Object obj) {
- IResource resource = null;
- if (obj instanceof IResource)
- resource = (IResource) obj;
- else if (obj instanceof IAdaptable)
- resource = ((IAdaptable) obj).getAdapter(IResource.class);
-
- if (resource == null)
- return null;
-
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if (hasInterestedComponents(project))
- return new WebResource(getModule(project), new Path("")); //$NON-NLS-1$
- return null;
- }
-
- IProject project = ProjectUtilities.getProject(resource);
- if (project != null && !hasInterestedComponents(project))
- return null;
-
- IVirtualComponent comp = ComponentCore.createComponent(project);
- // determine path
- IPath rootPath = comp.getRootFolder().getProjectRelativePath();
- IPath resourcePath = resource.getProjectRelativePath();
-
- // Check to make sure the resource is under the webApplication directory
- if (resourcePath.matchingFirstSegments(rootPath) != rootPath.segmentCount())
- return null;
-
- // Do not allow resource under the web-inf directory
- resourcePath = resourcePath.removeFirstSegments(rootPath.segmentCount());
- if (resourcePath.segmentCount() > 1 && resourcePath.segment(0).equals(INFO_DIRECTORY))
- return null;
-
- if (shouldExclude(resource))
- return null;
-
- // return Web resource type
- return new WebResource(getModule(project), resourcePath);
-
- }
-
- /**
- * Method shouldExclude.
- *
- * @param resource
- * @return boolean
- */
- private static boolean shouldExclude(IResource resource) {
- String fileExt = resource.getFileExtension();
-
- // Exclude files of certain extensions
- for (int i = 0; i < extensionsToExclude.length; i++) {
- String extension = extensionsToExclude[i];
- if (extension.equalsIgnoreCase(fileExt))
- return true;
- }
- return false;
- }
-
- protected static IModule getModule(IProject project) {
- if (hasInterestedComponents(project))
- return ServerUtil.getModule(project);
- return null;
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return isProjectOfType(project, IModuleConstants.WST_WEB_MODULE);
- }
-
- protected static boolean isProjectOfType(IProject project, String typeID) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return false;
- }
-
- if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java
deleted file mode 100644
index 8b5f3c5..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.wst.web.internal.facet;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class MappingDescriptor {
-
- protected IConfigurationElement element = null;
-
- public MappingDescriptor(IConfigurationElement configurationElement) {
- this.element = configurationElement;
- }
-
- public IConfigurationElement getElement() {
- return element;
- }
-
- public String getID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_ID);
- }
-
- public String getFacetRuntimeTypeID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_RUNTIME_TYPE_ID);
- }
-
- public String getFacetRuntimeVersion() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_RUNTIME_VERSION);
- }
-
- public String getFacetID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_ID);
- }
-
- public String getFacetVersion() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_VERSION);
- }
-
- public String getPresetID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_PRESET_ID);
- }
-
- @Override
- public String toString() {
- StringBuffer buff = new StringBuffer();
- buff.append("id:"); //$NON-NLS-1$
- buff.append(getID());
- buff.append(" facetRuntimeTypeID:"); //$NON-NLS-1$
- buff.append(getFacetRuntimeTypeID());
- buff.append(" facetRuntimeVersion:"); //$NON-NLS-1$
- buff.append(getFacetRuntimeVersion());
- buff.append(" facetID:"); //$NON-NLS-1$
- buff.append(getFacetID());
- buff.append(" facetVersion:"); //$NON-NLS-1$
- buff.append(getFacetVersion());
- buff.append(" presetID:"); //$NON-NLS-1$
- buff.append(getPresetID());
- return buff.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java
deleted file mode 100644
index b2bcd0b..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.eclipse.wst.web.internal.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentType;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class RuntimePresetMappingRegistry {
-
- static final String EXTENSION_POINT = "runtimePresetMappings"; //$NON-NLS-1$
-
- static final String ELEMENT_MAPPING = "mapping"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_RUNTIME_TYPE_ID = "facetRuntimeTypeID"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_RUNTIME_VERSION = "facetRuntimeVersion"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_ID = "facetID"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_VERSION = "facetVersion"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_PRESET_ID = "presetID"; //$NON-NLS-1$
-
- public static RuntimePresetMappingRegistry INSTANCE = new RuntimePresetMappingRegistry();
-
- private List<MappingDescriptor> descriptors = null;
-
- public String getPresetID(String facetRuntimeTypeID,
- String facetRuntimeVersion, String facetID, String facetVersion) {
- if (descriptors == null) {
- readDescriptors();
- }
- for (MappingDescriptor descriptor : descriptors) {
- if(matches(facetRuntimeTypeID, descriptor.getFacetRuntimeTypeID()) &&
- matches(facetRuntimeVersion, descriptor.getFacetRuntimeVersion()) &&
- matches(facetID, descriptor.getFacetID()) &&
- matches(facetVersion, descriptor.getFacetVersion())){
- return descriptor.getPresetID();
- }
- }
- return null;
- }
-
- /**
- * Returns true if the value is matched by the pattern The pattern consists
- * of a common deliminated list of simple patterns Each simple pattern has
- * an optional starting or ending * so a String.startsWith() or
- * String.endsWith(). Both may be combined to compute a String.indexOf() !=
- * -1
- *
- * @param value
- * @param pattern
- * @return
- */
- private static boolean matches(String value, String pattern){
- StringTokenizer strTok = new StringTokenizer(pattern, ","); //$NON-NLS-1$
- while(strTok.hasMoreTokens()){
- String simplePattern = strTok.nextToken().trim();
- if(simplePattern.startsWith("*")){ //$NON-NLS-1$
- if(simplePattern.length() < 2){
- return true; // i.e. *
- }
- if(simplePattern.endsWith("*")){ //$NON-NLS-1$
- if(simplePattern.length() < 3){
- return true; // i.e. **
- }
- if(value.indexOf(simplePattern.substring(1, simplePattern.length()-2)) != -1){
- return true;
- }
- } else {
- if(value.endsWith(simplePattern.substring(1))){
- return true;
- }
- }
- } else if(simplePattern.endsWith("*")){ //$NON-NLS-1$
- if(value.startsWith(simplePattern.substring(0, simplePattern.length()-2))){
- return true;
- }
- } else if(value.equals(simplePattern)){
- return true;
- }
- }
- return false;
- }
-
- private static List <String> getStaticTokens(String pattern){
- List <String> staticTokens = new ArrayList <String> ();
- StringTokenizer strTok = new StringTokenizer(pattern, ","); //$NON-NLS-1$
- while(strTok.hasMoreTokens()){
- String simplePattern = strTok.nextToken().trim();
- if(!simplePattern.startsWith("*") && !simplePattern.endsWith("*")){ //$NON-NLS-1$ //$NON-NLS-2$
- staticTokens.add(simplePattern);
- }
- }
- return staticTokens;
- }
-
-
- private void readDescriptors() {
- descriptors = new ArrayList<MappingDescriptor>();
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(WSTWebPlugin.PLUGIN_ID, EXTENSION_POINT);
- if (point == null)
- return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- if (ELEMENT_MAPPING.equals(element.getName())) {
- String id = element.getAttribute(ATTRIBUTE_ID);
- if (null == id || id.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
-
- String runtimeID = element.getAttribute(ATTRIBUTE_FACET_RUNTIME_TYPE_ID);
- if (null == runtimeID || runtimeID.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_RUNTIME_TYPE_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
-
- List <String> staticRuntimeIDs = getStaticTokens(runtimeID);
- List <IRuntimeComponentType> staticRuntimeTypes = new ArrayList<IRuntimeComponentType>();
- for(String staticRuntimeID : staticRuntimeIDs){
- try {
- IRuntimeComponentType runtimeType = RuntimeManager.getRuntimeComponentType(staticRuntimeID);
- if(runtimeType != null){
- staticRuntimeTypes.add(runtimeType);
- }
- } catch (IllegalArgumentException e) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_RUNTIME_TYPE_ID + ": " + runtimeID +" unable to resolve runtime: "+staticRuntimeID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- }
- }
-
- String runtimeVersionStr = element.getAttribute(ATTRIBUTE_FACET_RUNTIME_VERSION);
- if (null == runtimeVersionStr || runtimeVersionStr.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_RUNTIME_VERSION); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
- if(!staticRuntimeTypes.isEmpty()){
- List <String> staticRuntimeVersions = getStaticTokens(runtimeVersionStr);
- for(String staticVersion : staticRuntimeVersions){
- boolean foundVersion = false;
- for(int k=0;k<staticRuntimeTypes.size() && !foundVersion;k++){
- IRuntimeComponentType runtimeType = staticRuntimeTypes.get(k);
- try {
- runtimeType.getVersion(staticVersion);
- foundVersion = true;
- } catch (IllegalArgumentException e) {
- //eat it
- }
- }
- if(!foundVersion){
- StringBuffer validVersions = new StringBuffer(" valid versions include: "); //$NON-NLS-1$
- for(IRuntimeComponentType runtimeType : staticRuntimeTypes) {
- validVersions.append("\n"); //$NON-NLS-1$
- validVersions.append(runtimeType.getId());
- validVersions.append(": "); //$NON-NLS-1$
- for (Iterator<IRuntimeComponentVersion> iterator = runtimeType.getVersions().iterator(); iterator.hasNext();) {
- validVersions.append(iterator.next().getVersionString());
- if (iterator.hasNext()) {
- validVersions.append(" "); //$NON-NLS-1$
- }
- }
- }
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_RUNTIME_VERSION + ": " + staticVersion //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- + validVersions);
- }
- }
- }
-
- String facetID = element.getAttribute(ATTRIBUTE_FACET_ID);
- if (null == facetID || facetID.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
-
- List <String> staticFacetIDs = getStaticTokens(facetID);
- List <IProjectFacet> staticFacets = new ArrayList <IProjectFacet>();
- for(String staticFacetID:staticFacetIDs){
- try {
- IProjectFacet facet = ProjectFacetsManager.getProjectFacet(staticFacetID);
- if(null != facet){
- staticFacets.add(facet);
- }
- } catch (IllegalArgumentException e) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_ID + ": " + staticFacetID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
- }
-
- String facetVersionStr = element.getAttribute(ATTRIBUTE_FACET_VERSION);
- if (null == facetVersionStr || facetVersionStr.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_VERSION); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
- List <String>staticFacetVersionStrs = getStaticTokens(facetVersionStr);
- if(!staticFacets.isEmpty() && !staticFacetVersionStrs.isEmpty()){
- for(String staticFacetVersion:staticFacetVersionStrs){
- boolean foundFacetVersion = false;
- for(int k=0;k< staticFacets.size() && !foundFacetVersion; k++) {
- IProjectFacet staticFacet = staticFacets.get(k);
- try {
- IProjectFacetVersion staticVersion = staticFacet.getVersion(staticFacetVersion);
- if(staticVersion != null){
- foundFacetVersion = true;
- }
- } catch (IllegalArgumentException e) {
- //eat it
- }
- }
- if(!foundFacetVersion){
- StringBuffer validVersions = new StringBuffer(" valid versions include: "); //$NON-NLS-1$
- for(IProjectFacet staticFacet:staticFacets){
- validVersions.append("\n"); //$NON-NLS-1$
- validVersions.append(staticFacet.getId());
- validVersions.append(": "); //$NON-NLS-1$
- for (Iterator<IProjectFacetVersion> iterator = staticFacet.getVersions().iterator(); iterator.hasNext();) {
- validVersions.append(iterator.next().getVersionString());
- if (iterator.hasNext()) {
- validVersions.append(" "); //$NON-NLS-1$
- }
- }
- }
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_VERSION + ": " + staticFacetVersion //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- + validVersions);
- continue;
- }
- }
- }
- String presetID = element.getAttribute(ATTRIBUTE_PRESET_ID);
- if (null == presetID || presetID.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_PRESET_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
- try {
- ProjectFacetsManager.getPreset(presetID);
- } catch (IllegalArgumentException e) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_PRESET_ID + ": " + presetID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- continue;
- }
- MappingDescriptor descriptor = new MappingDescriptor(element);
- descriptors.add(descriptor);
- } else {
- WSTWebPlugin.logError("Elements must be named: " + ELEMENT_MAPPING + " within the extension: " + EXTENSION_POINT); //$NON-NLS-1$ //$NON-NLS-2$
- WSTWebPlugin.logError("Element: " + element.getName() + " is invalid within the extension: " + EXTENSION_POINT); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
deleted file mode 100644
index 5d7622b..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IServerContextRootDataModelProperties;
-
-/**
- * @deprecated Replaced by {@link IServerContextRootDataModelProperties}
- *
- */
-public interface IWebProjectPropertiesUpdateDataModelProperties {
-
- public static final String PROJECT = "IWebProjectPropertiesUpdateDataModelProperties.PROJECT"; //$NON-NLS-1$
- public static final String CONTEXT_ROOT = "IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
deleted file mode 100644
index b602f5a..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 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
- *******************************************************************************/
-
-import java.util.Set;
-
-import org.eclipse.wst.common.componentcore.internal.operation.ServerContextRootDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * @deprecated Replaced by {@link ServerContextRootDataModelProvider}
- *
- */
-public class WebProjectPropertiesUpdateDataModelProvider
- extends AbstractDataModelProvider
- implements IWebProjectPropertiesUpdateDataModelProperties{
-
- public WebProjectPropertiesUpdateDataModelProvider(){
- super();
- }
-
- @Override
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(PROJECT);
- names.add(CONTEXT_ROOT);
- return names;
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new WebProjectPropertiesUpdateOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
deleted file mode 100644
index 71ab6e9..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 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
- *******************************************************************************/
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.componentcore.internal.operation.ServerContextRootUpdateOperation;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-
-/**
- * @deprecated
- * Replaced by {@link ServerContextRootUpdateOperation}
- * @version 1.0
- * @author
- */
-public class WebProjectPropertiesUpdateOperation
- extends AbstractDataModelOperation
- implements IWebProjectPropertiesUpdateDataModelProperties{
-
-
- public WebProjectPropertiesUpdateOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IProject project = (IProject)model.getProperty( IWebProjectPropertiesUpdateDataModelProperties.PROJECT );
- String contextRoot = model.getStringProperty( IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT );
- if (contextRoot != null) {
- ComponentUtilities.setServerContextRoot(project, contextRoot);
- }
- return OK_STATUS;
- }
-
-}
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3aae4ec..02e1d2b 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -58,8 +58,6 @@
<module>org.eclipse.jst.jee.ui</module>
<module>org.eclipse.jst.jee.web</module>
<module>org.eclipse.jst.servlet.ui</module>
- <module>org.eclipse.wst.web</module>
- <module>org.eclipse.wst.web.ui</module>
<module>org.eclipse.wtp.jee.capabilities</module>
</modules>
</project>
